* refs/heads/tmp-d6bbe8b Linux 4.4.127 Revert "ip6_vti: adjust vti mtu according to mtu of lower device" net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata" spi: davinci: fix up dma_mapping_error() incorrect patch Revert "mtip32xx: use runtime tag to initialize command header" Revert "cpufreq: Fix governor module removal race" Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()" nospec: Kill array_index_nospec_mask_check() nospec: Move array_index_nospec() parameter checking into separate macro net: hns: Fix ethtool private flags md/raid10: reset the 'first' at the end of loop ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property ARM: dts: dra7: Add power hold and power controller properties to palmas Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition vt: change SGR 21 to follow the standards Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list staging: comedi: ni_mio_common: ack ai fifo error interrupts. fs/proc: Stop trying to report thread stacks crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one crypto: ahash - Fix early termination in hash walk parport_pc: Add support for WCH CH382L PCI-E single parallel port card. media: usbtv: prevent double free in error case mei: remove dev_err message on an unsupported ioctl USB: serial: cp210x: add ELDAT Easywave RX09 id USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator USB: serial: ftdi_sio: add RT Systems VX-8 cable usb: dwc2: Improve gadget state disconnection handling scsi: virtio_scsi: always read VPD pages for multiqueue too llist: clang: introduce member_address_is_nonnull() Bluetooth: Fix missing encryption refresh on Security Request netfilter: x_tables: add and use xt_check_proc_name netfilter: bridge: ebt_among: add more missing match size checks xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms() RDMA/ucma: Introduce safer rdma_addr_size() variants RDMA/ucma: Don't allow join attempts for unsupported AF family RDMA/ucma: Check that device exists prior to accessing it RDMA/ucma: Check that device is connected prior to access it RDMA/ucma: Ensure that CM_ID exists prior to access it RDMA/ucma: Fix use-after-free access in ucma_close RDMA/ucma: Check AF family prior resolving address xfrm_user: uncoditionally validate esn replay attribute struct arm64: avoid overflow in VA_START and PAGE_OFFSET selinux: Remove redundant check for unknown labeling behavior netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch tty: provide tty_name() even without CONFIG_TTY audit: add tty field to LOGIN event frv: declare jiffies to be located in the .data section jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp fs: compat: Remove warning from COMPATIBLE_IOCTL selinux: Remove unnecessary check of array base in selinux_set_mapping() cpumask: Add helper cpumask_available() genirq: Use cpumask_available() for check of cpumask variable netfilter: nf_nat_h323: fix logical-not-parentheses warning Input: mousedev - fix implicit conversion warning dm ioctl: remove double parentheses PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant writeback: fix the wrong congested state variable definition ACPI, PCI, irq: remove redundant check for null string pointer kprobes/x86: Fix to set RWX bits correctly before releasing trampoline usb: gadget: f_hid: fix: Prevent accessing released memory usb: gadget: align buffer size when allocating for OUT endpoint usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align usb: gadget: change len to size_t on alloc_ep_req() usb: gadget: define free_ep_req as universal function partitions/msdos: Unable to mount UFS 44bsd partitions perf/hwbp: Simplify the perf-hwbp code, fix documentation ALSA: pcm: potential uninitialized return values ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() mtd: jedec_probe: Fix crash in jedec_read_mfr() Replace #define with enum for better compilation errors. Add missing include to drivers/tty/goldfish.c Fix whitespace in drivers/tty/goldfish.c ANDROID: fuse: Add null terminator to path in canonical path to avoid issue ANDROID: sdcardfs: Fix sdcardfs to stop creating cases-sensitive duplicate entries. ANDROID: add missing include to pdev_bus ANDROID: pdev_bus: replace writel with gf_write_ptr ANDROID: Cleanup type casting in goldfish.h ANDROID: Include missing headers in goldfish.h ANDROID: cpufreq: times: skip printing invalid frequencies ANDROID: xt_qtaguid: Remove unnecessary null checks to device's name ANDROID: xt_qtaguid: Remove unnecessary null checks to ifa_label ANDROID: cpufreq: times: allocate enough space for a uid_entry Linux 4.4.126 net: systemport: Rewrite __bcm_sysport_tx_reclaim() net: fec: Fix unbalanced PM runtime calls ieee802154: 6lowpan: fix possible NULL deref in lowpan_device_event() s390/qeth: on channel error, reject further cmd requests s390/qeth: lock read device while queueing next buffer s390/qeth: when thread completes, wake up all waiters s390/qeth: free netdevice when removing a card team: Fix double free in error path skbuff: Fix not waking applications when errors are enqueued net: Only honor ifindex in IP_PKTINFO if non-0 netlink: avoid a double skb free in genlmsg_mcast() net/iucv: Free memory obtained by kzalloc net: ethernet: ti: cpsw: add check for in-band mode setting with RGMII PHY interface net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred l2tp: do not accept arbitrary sockets ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() dccp: check sk for closed state in dccp_sendmsg() net: Fix hlist corruptions in inet_evict_bucket() Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" scsi: sg: don't return bogus Sg_requests Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" UPSTREAM: drm: virtio-gpu: set atomic flag UPSTREAM: drm: virtio-gpu: transfer dumb buffers to host on plane update UPSTREAM: drm: virtio-gpu: ensure plane is flushed to host on atomic update UPSTREAM: drm: virtio-gpu: get the fb from the plane state for atomic updates Linux 4.4.125 bpf, x64: increase number of passes bpf: skip unnecessary capability check kbuild: disable clang's default use of -fmerge-all-constants staging: lustre: ptlrpc: kfree used instead of kvfree perf/x86/intel: Don't accidentally clear high bits in bdw_limit_period() x86/entry/64: Don't use IST entry for #BP stack x86/boot/64: Verify alignment of the LOAD segment x86/build/64: Force the linker to use 2MB page size kvm/x86: fix icebp instruction handling tty: vt: fix up tabstops properly can: cc770: Fix use after free in cc770_tx_interrupt() can: cc770: Fix queue stall & dropped RTR reply can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack staging: ncpfs: memory corruption in ncp_read_kernel() mtd: nand: fsl_ifc: Fix nand waitfunc return value tracing: probeevent: Fix to support minus offset from symbol rtlwifi: rtl8723be: Fix loss of signal brcmfmac: fix P2P_DEVICE ethernet address generation acpi, numa: fix pxm to online numa node associations drm: udl: Properly check framebuffer mmap offsets drm/radeon: Don't turn off DP sink when disconnected drm/vmwgfx: Fix a destoy-while-held mutex problem. x86/mm: implement free pmd/pte page interfaces mm/vmalloc: add interfaces to free unmapped page table libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs libata: Enable queued TRIM for Samsung SSD 860 libata: disable LPM for Crucial BX100 SSD 500GB drive libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs libata: remove WARN() for DMA or PIO command without data libata: fix length validation of ATAPI-relayed SCSI commands Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174 clk: bcm2835: Protect sections updating shared registers ahci: Add PCI-id for the Highpoint Rocketraid 644L card PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L mmc: dw_mmc: fix falling from idmac to PIO mode when dw_mci_reset occurs ALSA: hda/realtek - Always immediately update mute LED with pin VREF ALSA: aloop: Fix access to not-yet-ready substream via cable ALSA: aloop: Sync stale timer before release ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit iio: st_pressure: st_accel: pass correct platform data to init MIPS: ralink: Remove ralink_halt() ANDROID: cpufreq: times: fix proc_time_in_state_show dtc: turn off dtc unit address warnings by default Linux 4.4.124 RDMA/ucma: Fix access to non-initialized CM_ID object dmaengine: ti-dma-crossbar: Fix event mapping for TPCC_EVT_MUX_60_63 clk: si5351: Rename internal plls to avoid name collisions nfsd4: permit layoutget of executable-only files RDMA/ocrdma: Fix permissions for OCRDMA_RESET_STATS ip6_vti: adjust vti mtu according to mtu of lower device iommu/vt-d: clean up pr_irq if request_threaded_irq fails pinctrl: Really force states during suspend/resume coresight: Fix disabling of CoreSight TPIU pty: cancel pty slave port buf's work in tty_release drm/omap: DMM: Check for DMM readiness after successful transaction commit vgacon: Set VGA struct resource types IB/umem: Fix use of npages/nmap fields RDMA/cma: Use correct size when writing netlink stats IB/ipoib: Avoid memory leak if the SA returns a different DGID mmc: avoid removing non-removable hosts during suspend platform/chrome: Use proper protocol transfer function cros_ec: fix nul-termination for firmware build info media: [RESEND] media: dvb-frontends: Add delay to Si2168 restart media: bt8xx: Fix err 'bt878_probe()' rtlwifi: rtl_pci: Fix the bug when inactiveps is enabled. RDMA/iwpm: Fix uninitialized error code in iwpm_send_mapinfo() drm/msm: fix leak in failed get_pages media: c8sectpfe: fix potential NULL pointer dereference in c8sectpfe_timer_interrupt Bluetooth: hci_qca: Avoid setup failure on missing rampatch perf tests kmod-path: Don't fail if compressed modules aren't supported rtc: ds1374: wdt: Fix stop/start ioctl always returning -EINVAL rtc: ds1374: wdt: Fix issue with timeout scaling from secs to wdt ticks cifs: small underflow in cnvrtDosUnixTm() net: hns: fix ethtool_get_strings overflow in hns driver sm501fb: don't return zero on failure path in sm501fb_start() video: fbdev: udlfb: Fix buffer on stack tcm_fileio: Prevent information leak for short reads ia64: fix module loading for gcc-5.4 md/raid10: skip spare disk as 'first' disk Input: twl4030-pwrbutton - use correct device for irq request power: supply: pda_power: move from timer to delayed_work bnx2x: Align RX buffers drm/nouveau/kms: Increase max retries in scanout position queries. ACPI / PMIC: xpower: Fix power_table addresses ipmi/watchdog: fix wdog hang on panic waiting for ipmi response ARM: DRA7: clockdomain: Change the CLKTRCTRL of CM_PCIE_CLKSTCTRL to SW_WKUP mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a staging: wilc1000: fix unchecked return value staging: unisys: visorhba: fix s-Par to boot with option CONFIG_VMAP_STACK set to y mtip32xx: use runtime tag to initialize command header mfd: palmas: Reset the POWERHOLD mux during power off mac80211: don't parse encrypted management frames in ieee80211_frame_acked Btrfs: send, fix file hole not being preserved due to inline extent rndis_wlan: add return value validation mt7601u: check return value of alloc_skb iio: st_pressure: st_accel: Initialise sensor platform data properly NFS: don't try to cross a mountpount when there isn't one there. infiniband/uverbs: Fix integer overflows scsi: mac_esp: Replace bogus memory barrier with spinlock qlcnic: fix unchecked return value wan: pc300too: abort path on failure mmc: host: omap_hsmmc: checking for NULL instead of IS_ERR() openvswitch: Delete conntrack entry clashing with an expectation. netfilter: xt_CT: fix refcnt leak on error path Fix driver usage of 128B WQEs when WQ_CREATE is V1. ASoC: Intel: Skylake: Uninitialized variable in probe_codec() IB/mlx4: Change vma from shared to private IB/mlx4: Take write semaphore when changing the vma struct HSI: ssi_protocol: double free in ssip_pn_xmit() IB/ipoib: Update broadcast object if PKey value was changed in index 0 IB/ipoib: Fix deadlock between ipoib_stop and mcast join flow ALSA: hda - Fix headset microphone detection for ASUS N551 and N751 e1000e: fix timing for 82579 Gigabit Ethernet controller tcp: remove poll() flakes with FastOpen NFS: Fix missing pg_cleanup after nfs_pageio_cond_complete() md/raid10: wait up frozen array in handle_write_completed iommu/omap: Register driver before setting IOMMU ops ARM: 8668/1: ftrace: Fix dynamic ftrace with DEBUG_RODATA and !FRAME_POINTER KVM: PPC: Book3S PR: Exit KVM on failed mapping scsi: virtio_scsi: Always try to read VPD pages clk: ns2: Correct SDIO bits ath: Fix updating radar flags for coutry code India spi: dw: Disable clock after unregistering the host media/dvb-core: Race condition when writing to CAM net: ipv6: send unsolicited NA on admin up i2c: i2c-scmi: add a MS HID genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs cpufreq/sh: Replace racy task affinity logic ACPI/processor: Replace racy task affinity logic ACPI/processor: Fix error handling in __acpi_processor_start() time: Change posix clocks ops interfaces to use timespec64 Input: ar1021_i2c - fix too long name in driver's device table rtc: cmos: Do not assume irq 8 for rtc when there are no legacy irqs x86: i8259: export legacy_pic symbol regulator: anatop: set default voltage selector for pcie platform/x86: asus-nb-wmi: Add wapf4 quirk for the X302UA staging: android: ashmem: Fix possible deadlock in ashmem_ioctl CIFS: Enable encryption during session setup phase SMB3: Validate negotiate request must always be signed tpm_tis: fix potential buffer overruns caused by bit glitches on the bus tpm: fix potential buffer overruns caused by bit glitches on the bus BACKPORT, FROMLIST: crypto: arm64/speck - add NEON-accelerated implementation of Speck-XTS Linux 4.4.123 bpf: fix incorrect sign extension in check_alu_op() usb: gadget: bdc: 64-bit pointer capability check USB: gadget: udc: Add missing platform_device_put() on error in bdc_pci_probe() btrfs: Fix use-after-free when cleaning up fs_devs with a single stale device btrfs: alloc_chunk: fix DUP stripe size handling ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux scsi: sg: only check for dxfer_len greater than 256M scsi: sg: fix static checker warning in sg_is_valid_dxfer scsi: sg: fix SG_DXFER_FROM_DEV transfers irqchip/gic-v3-its: Ensure nr_ites >= nr_lpis fs/aio: Use RCU accessors for kioctx_table->table[] fs/aio: Add explicit RCU grace period when freeing kioctx lock_parent() needs to recheck if dentry got __dentry_kill'ed under it fs: Teach path_connected to handle nfs filesystems with multiple roots. drm/amdgpu/dce: Don't turn off DP sink when disconnected ALSA: seq: Clear client entry before deleting else at closing ALSA: seq: Fix possible UAF in snd_seq_check_queue() ALSA: hda - Revert power_save option default value ALSA: pcm: Fix UAF in snd_pcm_oss_get_formats() x86/mm: Fix vmalloc_fault to use pXd_large x86/vm86/32: Fix POPF emulation selftests/x86/entry_from_vm86: Add test cases for POPF selftests/x86: Add tests for the STR and SLDT instructions selftests/x86: Add tests for User-Mode Instruction Prevention selftests/x86/entry_from_vm86: Exit with 1 if we fail ima: relax requiring a file signature for new files with zero length rcutorture/configinit: Fix build directory error message ipvlan: add L2 check for packets arriving via virtual devices ASoC: nuc900: Fix a loop timeout test mac80211: remove BUG() when interface type is invalid mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED agp/intel: Flush all chipset writes after updating the GGTT drm/amdkfd: Fix memory leaks in kfd topology veth: set peer GSO values media: cpia2: Fix a couple off by one bugs scsi: dh: add new rdac devices scsi: devinfo: apply to HP XP the same flags as Hitachi VSP scsi: core: scsi_get_device_flags_keyed(): Always return device flags spi: sun6i: disable/unprepare clocks on remove tools/usbip: fixes build with musl libc toolchain ath10k: fix invalid STS_CAP_OFFSET_MASK clk: qcom: msm8916: fix mnd_width for codec_digcodec cpufreq: Fix governor module removal race ath10k: update tdls teardown state to target ARM: dts: omap3-n900: Fix the audio CODEC's reset pin ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]() net: xfrm: allow clearing socket xfrm policies. test_firmware: fix setting old custom fw path back on exit sched: Stop resched_cpu() from sending IPIs to offline CPUs sched: Stop switched_to_rt() from sending IPIs to offline CPUs ARM: dts: exynos: Correct Trats2 panel reset line HID: elo: clear BTN_LEFT mapping video/hdmi: Allow "empty" HDMI infoframes drm/edid: set ELD connector type in drm_edid_to_eld() wil6210: fix memory access violation in wil_memcpy_from/toio_32 pwm: tegra: Increase precision in PWM rate calculation kprobes/x86: Set kprobes pages read-only kprobes/x86: Fix kprobe-booster not to boost far call instructions scsi: sg: close race condition in sg_remove_sfp_usercontext() scsi: sg: check for valid direction before starting the request perf session: Don't rely on evlist in pipe mode perf inject: Copy events when reordering events in pipe mode drivers/perf: arm_pmu: handle no platform_device usb: gadget: dummy_hcd: Fix wrong power status bit clear/reset in dummy_hub_control() usb: dwc2: Make sure we disconnect the gadget state md/raid6: Fix anomily when recovering a single device in RAID6. regulator: isl9305: fix array size MIPS: r2-on-r6-emu: Clear BLTZALL and BGEZALL debugfs counters MIPS: r2-on-r6-emu: Fix BLEZL and BGTZL identification MIPS: BPF: Fix multiple problems in JIT skb access helpers. MIPS: BPF: Quit clobbering callee saved registers in JIT code. coresight: Fixes coresight DT parse to get correct output port ID. drm/amdgpu: Fail fb creation from imported dma-bufs. (v2) drm/radeon: Fail fb creation from imported dma-bufs. video: ARM CLCD: fix dma allocation size iommu/iova: Fix underflow bug in __alloc_and_insert_iova_range apparmor: Make path_max parameter readonly scsi: ses: don't get power status of SES device slot on probe fm10k: correctly check if interface is removed ALSA: firewire-digi00x: handle all MIDI messages on streaming packets reiserfs: Make cancel_old_flush() reliable ARM: dts: koelsch: Correct clock frequency of X2 DU clock input net/faraday: Add missing include of of.h powerpc: Avoid taking a data miss on every userspace instruction miss ARM: dts: r8a7791: Correct parent of SSI[0-9] clocks ARM: dts: r8a7790: Correct parent of SSI[0-9] clocks NFC: nfcmrvl: double free on error path NFC: nfcmrvl: Include unaligned.h instead of access_ok.h vxlan: vxlan dev should inherit lowerdev's gso_max_size drm/vmwgfx: Fixes to vmwgfx_fb braille-console: Fix value returned by _braille_console_setup bonding: refine bond_fold_stats() wrap detection f2fs: relax node version check for victim data in gc blk-throttle: make sure expire time isn't too big mm: Fix false-positive VM_BUG_ON() in page_cache_{get,add}_speculative() driver: (adm1275) set the m,b and R coefficients correctly for power dmaengine: imx-sdma: add 1ms delay to ensure SDMA channel is stopped tcp: sysctl: Fix a race to avoid unexpected 0 window from space spi: omap2-mcspi: poll OMAP2_MCSPI_CHSTAT_RXS for PIO transfer ASoC: rcar: ssi: don't set SSICR.CKDV = 000 with SSIWSR.CONT sched: act_csum: don't mangle TCP and UDP GSO packets Input: qt1070 - add OF device ID table sysrq: Reset the watchdog timers while displaying high-resolution timers timers, sched_clock: Update timeout for clock wrap media: i2c/soc_camera: fix ov6650 sensor getting wrong clock scsi: ipr: Fix missed EH wakeup solo6x10: release vb2 buffers in solo_stop_streaming() of: fix of_device_get_modalias returned length when truncating buffers batman-adv: handle race condition for claims between gateways ARM: dts: Adjust moxart IRQ controller and flags net/8021q: create device with all possible features in wanted_features HID: clamp input to logical range if no null state perf probe: Return errno when not hitting any event ath10k: disallow DFS simulation if DFS channel is not enabled drm: Defer disabling the vblank IRQ until the next interrupt (for instant-off) drivers: net: xgene: Fix hardware checksum setting perf tools: Make perf_event__synthesize_mmap_events() scale i40e: fix ethtool to get EEPROM data from X722 interface i40e: Acquire NVM lock before reads on all devices perf sort: Fix segfault with basic block 'cycles' sort dimension selinux: check for address length in selinux_socket_bind() PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown() ath10k: fix a warning during channel switch with multiple vaps drm: qxl: Don't alloc fbdev if emulation is not supported HID: reject input outside logical range only if null state is set staging: wilc1000: add check for kmalloc allocation failure. staging: speakup: Replace BUG_ON() with WARN_ON(). Input: tsc2007 - check for presence and power down tsc2007 during probe blkcg: fix double free of new_blkg in blkcg_init_queue ANDROID: cpufreq: times: avoid prematurely freeing uid_entry ANDROID: Use standard logging functions in goldfish_pipe ANDROID: Fix whitespace in goldfish staging: android: ashmem: Fix possible deadlock in ashmem_ioctl llist: clang: introduce member_address_is_nonnull() Linux 4.4.122 fixup: sctp: verify size of a new chunk in _sctp_make_chunk() serial: 8250_pci: Add Brainboxes UC-260 4 port serial device usb: gadget: f_fs: Fix use-after-free in ffs_fs_kill_sb() usb: usbmon: Read text within supplied buffer size USB: usbmon: remove assignment from IS_ERR argument usb: quirks: add control message delay for 1b1c:1b20 USB: storage: Add JMicron bridge 152d:2567 to unusual_devs.h staging: android: ashmem: Fix lockdep issue during llseek staging: comedi: fix comedi_nsamples_left. uas: fix comparison for error code tty/serial: atmel: add new version check for usart serial: sh-sci: prevent lockup on full TTY buffers x86: Treat R_X86_64_PLT32 as R_X86_64_PC32 x86/module: Detect and skip invalid relocations Revert "ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux" NFS: Fix an incorrect type in struct nfs_direct_req scsi: qla2xxx: Replace fcport alloc with qla2x00_alloc_fcport ubi: Fix race condition between ubi volume creation and udev ext4: inplace xattr block update fails to deduplicate blocks netfilter: x_tables: pack percpu counter allocations netfilter: x_tables: pass xt_counters struct to counter allocator netfilter: x_tables: pass xt_counters struct instead of packet counter netfilter: use skb_to_full_sk in ip_route_me_harder netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt netfilter: bridge: ebt_among: add missing match size checks netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets netfilter: IDLETIMER: be syzkaller friendly netfilter: nat: cope with negative port range netfilter: x_tables: fix missing timer initialization in xt_LED netfilter: add back stackpointer size checks tc358743: fix register i2c_rd/wr function fix Input: tca8418_keypad - remove double read of key event register ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds netfilter: nfnetlink_queue: fix timestamp attribute watchdog: hpwdt: fix unused variable warning watchdog: hpwdt: Check source of NMI watchdog: hpwdt: SMBIOS check nospec: Include <asm/barrier.h> dependency ALSA: hda: add dock and led support for HP ProBook 640 G2 ALSA: hda: add dock and led support for HP EliteBook 820 G3 ALSA: seq: More protection for concurrent write and ioctl races ALSA: seq: Don't allow resizing pool in use ALSA: hda/realtek - Fix dock line-out volume on Dell Precision 7520 x86/MCE: Serialize sysfs changes bcache: don't attach backing with duplicate UUID kbuild: Handle builtin dtb file names containing hyphens loop: Fix lost writes caused by missing flag Input: matrix_keypad - fix race when disabling interrupts MIPS: OCTEON: irq: Check for null return on kzalloc allocation MIPS: ath25: Check for kzalloc allocation failure MIPS: BMIPS: Do not mask IPIs during suspend drm/amdgpu: fix KV harvesting drm/radeon: fix KV harvesting drm/amdgpu: Notify sbios device ready before send request drm/amdgpu: Fix deadlock on runtime suspend drm/radeon: Fix deadlock on runtime suspend drm/nouveau: Fix deadlock on runtime suspend drm: Allow determining if current task is output poll worker workqueue: Allow retrieval of current task's work struct scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS RDMA/mlx5: Fix integer overflow while resizing CQ RDMA/ucma: Check that user doesn't overflow QP state RDMA/ucma: Limit possible option size ANDROID: ranchu: 32 bit framebuffer support ANDROID: Address checkpatch warnings in goldfishfb ANDROID: Address checkpatch.pl warnings in goldfish_pipe ANDROID: sdcardfs: fix lock issue on 32 bit/SMP architectures ANDROID: goldfish: Fix typo in goldfish_cmd_locked() call ANDROID: Address checkpatch.pl warnings in goldfish_pipe_v2 FROMLIST: f2fs: don't put dentry page in pagecache into highmem Linux 4.4.121 btrfs: preserve i_mode if __btrfs_set_acl() fails bpf, x64: implement retpoline for tail call dm io: fix duplicate bio completion due to missing ref count mpls, nospec: Sanitize array index in mpls_label_ok() net: mpls: Pull common label check into helper sctp: verify size of a new chunk in _sctp_make_chunk() s390/qeth: fix IPA command submission race s390/qeth: fix SETIP command handling sctp: fix dst refcnt leak in sctp_v6_get_dst() sctp: fix dst refcnt leak in sctp_v4_get_dst udplite: fix partial checksum initialization ppp: prevent unregistered channels from connecting to PPP units netlink: ensure to loop over all netns in genlmsg_multicast_allns() net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68 net: fix race on decreasing number of TX queues ipv6 sit: work around bogus gcc-8 -Wrestrict warning hdlc_ppp: carrier detect ok, don't turn off negotiation fib_semantics: Don't match route with mismatching tclassid bridge: check brport attr show in brport_show Revert "led: core: Fix brightness setting when setting delay_off=0" x86/spectre: Fix an error message leds: do not overflow sysfs buffer in led_trigger_show x86/apic/vector: Handle legacy irq data correctly ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux btrfs: Don't clear SGID when inheriting ACLs x86/syscall: Sanitize syscall table de-references under speculation fix KVM: mmu: Fix overlap between public and private memslots ARM: mvebu: Fix broken PL310_ERRATA_753970 selects nospec: Allow index argument to have const-qualified type media: m88ds3103: don't call a non-initalized function cpufreq: s3c24xx: Fix broken s3c_cpufreq_init() ALSA: hda: Add a power_save blacklist ALSA: usb-audio: Add a quirck for B&W PX headphones tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus tpm: st33zp24: fix potential buffer overruns caused by bit glitches on the bus ANDROID: Delete the goldfish_nand driver. ANDROID: Add input support for Android Wear. ANDROID: proc: fix config & includes for /proc/uid FROMLIST: ARM: amba: Don't read past the end of sysfs "driver_override" buffer UPSTREAM: ANDROID: binder: remove WARN() for redundant txn error ANDROID: cpufreq: times: Add missing includes ANDROID: cpufreq: Add time_in_state to /proc/uid directories ANDROID: proc: Add /proc/uid directory ANDROID: cpufreq: times: track per-uid time in state ANDROID: cpufreq: track per-task time in state Conflicts: drivers/gpu/drm/msm/msm_gem.c drivers/net/wireless/ath/regd.c kernel/sched/core.c Change-Id: I9bb7b5a062415da6925a5a56a34e6eb066a53320 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
1418 lines
36 KiB
C
1418 lines
36 KiB
C
/*
|
|
* Common Block IO controller cgroup interface
|
|
*
|
|
* Based on ideas and code from CFQ, CFS and BFQ:
|
|
* Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
|
|
*
|
|
* Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
|
|
* Paolo Valente <paolo.valente@unimore.it>
|
|
*
|
|
* Copyright (C) 2009 Vivek Goyal <vgoyal@redhat.com>
|
|
* Nauman Rafique <nauman@google.com>
|
|
*
|
|
* For policy-specific per-blkcg data:
|
|
* Copyright (C) 2015 Paolo Valente <paolo.valente@unimore.it>
|
|
* Arianna Avanzini <avanzini.arianna@gmail.com>
|
|
*/
|
|
#include <linux/ioprio.h>
|
|
#include <linux/kdev_t.h>
|
|
#include <linux/module.h>
|
|
#include <linux/err.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/genhd.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/atomic.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/blk-cgroup.h>
|
|
#include "blk.h"
|
|
|
|
#define MAX_KEY_LEN 100
|
|
|
|
/*
|
|
* blkcg_pol_mutex protects blkcg_policy[] and policy [de]activation.
|
|
* blkcg_pol_register_mutex nests outside of it and synchronizes entire
|
|
* policy [un]register operations including cgroup file additions /
|
|
* removals. Putting cgroup file registration outside blkcg_pol_mutex
|
|
* allows grabbing it from cgroup callbacks.
|
|
*/
|
|
static DEFINE_MUTEX(blkcg_pol_register_mutex);
|
|
static DEFINE_MUTEX(blkcg_pol_mutex);
|
|
|
|
struct blkcg blkcg_root;
|
|
EXPORT_SYMBOL_GPL(blkcg_root);
|
|
|
|
struct cgroup_subsys_state * const blkcg_root_css = &blkcg_root.css;
|
|
|
|
static struct blkcg_policy *blkcg_policy[BLKCG_MAX_POLS];
|
|
|
|
static LIST_HEAD(all_blkcgs); /* protected by blkcg_pol_mutex */
|
|
|
|
static bool blkcg_policy_enabled(struct request_queue *q,
|
|
const struct blkcg_policy *pol)
|
|
{
|
|
return pol && test_bit(pol->plid, q->blkcg_pols);
|
|
}
|
|
|
|
/**
|
|
* blkg_free - free a blkg
|
|
* @blkg: blkg to free
|
|
*
|
|
* Free @blkg which may be partially allocated.
|
|
*/
|
|
static void blkg_free(struct blkcg_gq *blkg)
|
|
{
|
|
int i;
|
|
|
|
if (!blkg)
|
|
return;
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++)
|
|
if (blkg->pd[i])
|
|
blkcg_policy[i]->pd_free_fn(blkg->pd[i]);
|
|
|
|
if (blkg->blkcg != &blkcg_root)
|
|
blk_exit_rl(&blkg->rl);
|
|
|
|
blkg_rwstat_exit(&blkg->stat_ios);
|
|
blkg_rwstat_exit(&blkg->stat_bytes);
|
|
kfree(blkg);
|
|
}
|
|
|
|
/**
|
|
* blkg_alloc - allocate a blkg
|
|
* @blkcg: block cgroup the new blkg is associated with
|
|
* @q: request_queue the new blkg is associated with
|
|
* @gfp_mask: allocation mask to use
|
|
*
|
|
* Allocate a new blkg assocating @blkcg and @q.
|
|
*/
|
|
static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
|
|
gfp_t gfp_mask)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
int i;
|
|
|
|
/* alloc and init base part */
|
|
blkg = kzalloc_node(sizeof(*blkg), gfp_mask, q->node);
|
|
if (!blkg)
|
|
return NULL;
|
|
|
|
if (blkg_rwstat_init(&blkg->stat_bytes, gfp_mask) ||
|
|
blkg_rwstat_init(&blkg->stat_ios, gfp_mask))
|
|
goto err_free;
|
|
|
|
blkg->q = q;
|
|
INIT_LIST_HEAD(&blkg->q_node);
|
|
blkg->blkcg = blkcg;
|
|
atomic_set(&blkg->refcnt, 1);
|
|
|
|
/* root blkg uses @q->root_rl, init rl only for !root blkgs */
|
|
if (blkcg != &blkcg_root) {
|
|
if (blk_init_rl(&blkg->rl, q, gfp_mask))
|
|
goto err_free;
|
|
blkg->rl.blkg = blkg;
|
|
}
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
struct blkg_policy_data *pd;
|
|
|
|
if (!blkcg_policy_enabled(q, pol))
|
|
continue;
|
|
|
|
/* alloc per-policy data and attach it to blkg */
|
|
pd = pol->pd_alloc_fn(gfp_mask, q->node);
|
|
if (!pd)
|
|
goto err_free;
|
|
|
|
blkg->pd[i] = pd;
|
|
pd->blkg = blkg;
|
|
pd->plid = i;
|
|
}
|
|
|
|
return blkg;
|
|
|
|
err_free:
|
|
blkg_free(blkg);
|
|
return NULL;
|
|
}
|
|
|
|
struct blkcg_gq *blkg_lookup_slowpath(struct blkcg *blkcg,
|
|
struct request_queue *q, bool update_hint)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
|
|
/*
|
|
* Hint didn't match. Look up from the radix tree. Note that the
|
|
* hint can only be updated under queue_lock as otherwise @blkg
|
|
* could have already been removed from blkg_tree. The caller is
|
|
* responsible for grabbing queue_lock if @update_hint.
|
|
*/
|
|
blkg = radix_tree_lookup(&blkcg->blkg_tree, q->id);
|
|
if (blkg && blkg->q == q) {
|
|
if (update_hint) {
|
|
lockdep_assert_held(q->queue_lock);
|
|
rcu_assign_pointer(blkcg->blkg_hint, blkg);
|
|
}
|
|
return blkg;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_lookup_slowpath);
|
|
|
|
/*
|
|
* If @new_blkg is %NULL, this function tries to allocate a new one as
|
|
* necessary using %GFP_NOWAIT. @new_blkg is always consumed on return.
|
|
*/
|
|
static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
|
|
struct request_queue *q,
|
|
struct blkcg_gq *new_blkg)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
struct bdi_writeback_congested *wb_congested;
|
|
int i, ret;
|
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
/* blkg holds a reference to blkcg */
|
|
if (!css_tryget_online(&blkcg->css)) {
|
|
ret = -ENODEV;
|
|
goto err_free_blkg;
|
|
}
|
|
|
|
wb_congested = wb_congested_get_create(q->backing_dev_info,
|
|
blkcg->css.id, GFP_NOWAIT);
|
|
if (!wb_congested) {
|
|
ret = -ENOMEM;
|
|
goto err_put_css;
|
|
}
|
|
|
|
/* allocate */
|
|
if (!new_blkg) {
|
|
new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT);
|
|
if (unlikely(!new_blkg)) {
|
|
ret = -ENOMEM;
|
|
goto err_put_congested;
|
|
}
|
|
}
|
|
blkg = new_blkg;
|
|
blkg->wb_congested = wb_congested;
|
|
|
|
/* link parent */
|
|
if (blkcg_parent(blkcg)) {
|
|
blkg->parent = __blkg_lookup(blkcg_parent(blkcg), q, false);
|
|
if (WARN_ON_ONCE(!blkg->parent)) {
|
|
ret = -ENODEV;
|
|
goto err_put_congested;
|
|
}
|
|
blkg_get(blkg->parent);
|
|
}
|
|
|
|
/* invoke per-policy init */
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
if (blkg->pd[i] && pol->pd_init_fn)
|
|
pol->pd_init_fn(blkg->pd[i]);
|
|
}
|
|
|
|
/* insert */
|
|
spin_lock(&blkcg->lock);
|
|
ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg);
|
|
if (likely(!ret)) {
|
|
hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list);
|
|
list_add(&blkg->q_node, &q->blkg_list);
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
if (blkg->pd[i] && pol->pd_online_fn)
|
|
pol->pd_online_fn(blkg->pd[i]);
|
|
}
|
|
}
|
|
blkg->online = true;
|
|
spin_unlock(&blkcg->lock);
|
|
|
|
if (!ret)
|
|
return blkg;
|
|
|
|
/* @blkg failed fully initialized, use the usual release path */
|
|
blkg_put(blkg);
|
|
return ERR_PTR(ret);
|
|
|
|
err_put_congested:
|
|
wb_congested_put(wb_congested);
|
|
err_put_css:
|
|
css_put(&blkcg->css);
|
|
err_free_blkg:
|
|
blkg_free(new_blkg);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
/**
|
|
* blkg_lookup_create - lookup blkg, try to create one if not there
|
|
* @blkcg: blkcg of interest
|
|
* @q: request_queue of interest
|
|
*
|
|
* Lookup blkg for the @blkcg - @q pair. If it doesn't exist, try to
|
|
* create one. blkg creation is performed recursively from blkcg_root such
|
|
* that all non-root blkg's have access to the parent blkg. This function
|
|
* should be called under RCU read lock and @q->queue_lock.
|
|
*
|
|
* Returns pointer to the looked up or created blkg on success, ERR_PTR()
|
|
* value on error. If @q is dead, returns ERR_PTR(-EINVAL). If @q is not
|
|
* dead and bypassing, returns ERR_PTR(-EBUSY).
|
|
*/
|
|
struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,
|
|
struct request_queue *q)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
/*
|
|
* This could be the first entry point of blkcg implementation and
|
|
* we shouldn't allow anything to go through for a bypassing queue.
|
|
*/
|
|
if (unlikely(blk_queue_bypass(q)))
|
|
return ERR_PTR(blk_queue_dying(q) ? -ENODEV : -EBUSY);
|
|
|
|
blkg = __blkg_lookup(blkcg, q, true);
|
|
if (blkg)
|
|
return blkg;
|
|
|
|
/*
|
|
* Create blkgs walking down from blkcg_root to @blkcg, so that all
|
|
* non-root blkgs have access to their parents.
|
|
*/
|
|
while (true) {
|
|
struct blkcg *pos = blkcg;
|
|
struct blkcg *parent = blkcg_parent(blkcg);
|
|
|
|
while (parent && !__blkg_lookup(parent, q, false)) {
|
|
pos = parent;
|
|
parent = blkcg_parent(parent);
|
|
}
|
|
|
|
blkg = blkg_create(pos, q, NULL);
|
|
if (pos == blkcg || IS_ERR(blkg))
|
|
return blkg;
|
|
}
|
|
}
|
|
|
|
static void blkg_destroy(struct blkcg_gq *blkg)
|
|
{
|
|
struct blkcg *blkcg = blkg->blkcg;
|
|
struct blkcg_gq *parent = blkg->parent;
|
|
int i;
|
|
|
|
lockdep_assert_held(blkg->q->queue_lock);
|
|
lockdep_assert_held(&blkcg->lock);
|
|
|
|
/* Something wrong if we are trying to remove same group twice */
|
|
WARN_ON_ONCE(list_empty(&blkg->q_node));
|
|
WARN_ON_ONCE(hlist_unhashed(&blkg->blkcg_node));
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
if (blkg->pd[i] && pol->pd_offline_fn)
|
|
pol->pd_offline_fn(blkg->pd[i]);
|
|
}
|
|
|
|
if (parent) {
|
|
blkg_rwstat_add_aux(&parent->stat_bytes, &blkg->stat_bytes);
|
|
blkg_rwstat_add_aux(&parent->stat_ios, &blkg->stat_ios);
|
|
}
|
|
|
|
blkg->online = false;
|
|
|
|
radix_tree_delete(&blkcg->blkg_tree, blkg->q->id);
|
|
list_del_init(&blkg->q_node);
|
|
hlist_del_init_rcu(&blkg->blkcg_node);
|
|
|
|
/*
|
|
* Both setting lookup hint to and clearing it from @blkg are done
|
|
* under queue_lock. If it's not pointing to @blkg now, it never
|
|
* will. Hint assignment itself can race safely.
|
|
*/
|
|
if (rcu_access_pointer(blkcg->blkg_hint) == blkg)
|
|
rcu_assign_pointer(blkcg->blkg_hint, NULL);
|
|
|
|
/*
|
|
* Put the reference taken at the time of creation so that when all
|
|
* queues are gone, group can be destroyed.
|
|
*/
|
|
blkg_put(blkg);
|
|
}
|
|
|
|
/**
|
|
* blkg_destroy_all - destroy all blkgs associated with a request_queue
|
|
* @q: request_queue of interest
|
|
*
|
|
* Destroy all blkgs associated with @q.
|
|
*/
|
|
static void blkg_destroy_all(struct request_queue *q)
|
|
{
|
|
struct blkcg_gq *blkg, *n;
|
|
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
list_for_each_entry_safe(blkg, n, &q->blkg_list, q_node) {
|
|
struct blkcg *blkcg = blkg->blkcg;
|
|
|
|
spin_lock(&blkcg->lock);
|
|
blkg_destroy(blkg);
|
|
spin_unlock(&blkcg->lock);
|
|
}
|
|
|
|
q->root_blkg = NULL;
|
|
q->root_rl.blkg = NULL;
|
|
}
|
|
|
|
/*
|
|
* A group is RCU protected, but having an rcu lock does not mean that one
|
|
* can access all the fields of blkg and assume these are valid. For
|
|
* example, don't try to follow throtl_data and request queue links.
|
|
*
|
|
* Having a reference to blkg under an rcu allows accesses to only values
|
|
* local to groups like group stats and group rate limits.
|
|
*/
|
|
void __blkg_release_rcu(struct rcu_head *rcu_head)
|
|
{
|
|
struct blkcg_gq *blkg = container_of(rcu_head, struct blkcg_gq, rcu_head);
|
|
|
|
/* release the blkcg and parent blkg refs this blkg has been holding */
|
|
css_put(&blkg->blkcg->css);
|
|
if (blkg->parent)
|
|
blkg_put(blkg->parent);
|
|
|
|
wb_congested_put(blkg->wb_congested);
|
|
|
|
blkg_free(blkg);
|
|
}
|
|
EXPORT_SYMBOL_GPL(__blkg_release_rcu);
|
|
|
|
/*
|
|
* The next function used by blk_queue_for_each_rl(). It's a bit tricky
|
|
* because the root blkg uses @q->root_rl instead of its own rl.
|
|
*/
|
|
struct request_list *__blk_queue_next_rl(struct request_list *rl,
|
|
struct request_queue *q)
|
|
{
|
|
struct list_head *ent;
|
|
struct blkcg_gq *blkg;
|
|
|
|
/*
|
|
* Determine the current blkg list_head. The first entry is
|
|
* root_rl which is off @q->blkg_list and mapped to the head.
|
|
*/
|
|
if (rl == &q->root_rl) {
|
|
ent = &q->blkg_list;
|
|
/* There are no more block groups, hence no request lists */
|
|
if (list_empty(ent))
|
|
return NULL;
|
|
} else {
|
|
blkg = container_of(rl, struct blkcg_gq, rl);
|
|
ent = &blkg->q_node;
|
|
}
|
|
|
|
/* walk to the next list_head, skip root blkcg */
|
|
ent = ent->next;
|
|
if (ent == &q->root_blkg->q_node)
|
|
ent = ent->next;
|
|
if (ent == &q->blkg_list)
|
|
return NULL;
|
|
|
|
blkg = container_of(ent, struct blkcg_gq, q_node);
|
|
return &blkg->rl;
|
|
}
|
|
|
|
static int blkcg_reset_stats(struct cgroup_subsys_state *css,
|
|
struct cftype *cftype, u64 val)
|
|
{
|
|
struct blkcg *blkcg = css_to_blkcg(css);
|
|
struct blkcg_gq *blkg;
|
|
int i;
|
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
spin_lock_irq(&blkcg->lock);
|
|
|
|
/*
|
|
* Note that stat reset is racy - it doesn't synchronize against
|
|
* stat updates. This is a debug feature which shouldn't exist
|
|
* anyway. If you get hit by a race, retry.
|
|
*/
|
|
hlist_for_each_entry(blkg, &blkcg->blkg_list, blkcg_node) {
|
|
blkg_rwstat_reset(&blkg->stat_bytes);
|
|
blkg_rwstat_reset(&blkg->stat_ios);
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
if (blkg->pd[i] && pol->pd_reset_stats_fn)
|
|
pol->pd_reset_stats_fn(blkg->pd[i]);
|
|
}
|
|
}
|
|
|
|
spin_unlock_irq(&blkcg->lock);
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
return 0;
|
|
}
|
|
|
|
const char *blkg_dev_name(struct blkcg_gq *blkg)
|
|
{
|
|
/* some drivers (floppy) instantiate a queue w/o disk registered */
|
|
if (blkg->q->backing_dev_info->dev)
|
|
return dev_name(blkg->q->backing_dev_info->dev);
|
|
return NULL;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_dev_name);
|
|
|
|
/**
|
|
* blkcg_print_blkgs - helper for printing per-blkg data
|
|
* @sf: seq_file to print to
|
|
* @blkcg: blkcg of interest
|
|
* @prfill: fill function to print out a blkg
|
|
* @pol: policy in question
|
|
* @data: data to be passed to @prfill
|
|
* @show_total: to print out sum of prfill return values or not
|
|
*
|
|
* This function invokes @prfill on each blkg of @blkcg if pd for the
|
|
* policy specified by @pol exists. @prfill is invoked with @sf, the
|
|
* policy data and @data and the matching queue lock held. If @show_total
|
|
* is %true, the sum of the return values from @prfill is printed with
|
|
* "Total" label at the end.
|
|
*
|
|
* This is to be used to construct print functions for
|
|
* cftype->read_seq_string method.
|
|
*/
|
|
void blkcg_print_blkgs(struct seq_file *sf, struct blkcg *blkcg,
|
|
u64 (*prfill)(struct seq_file *,
|
|
struct blkg_policy_data *, int),
|
|
const struct blkcg_policy *pol, int data,
|
|
bool show_total)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
u64 total = 0;
|
|
|
|
rcu_read_lock();
|
|
hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) {
|
|
spin_lock_irq(blkg->q->queue_lock);
|
|
if (blkcg_policy_enabled(blkg->q, pol))
|
|
total += prfill(sf, blkg->pd[pol->plid], data);
|
|
spin_unlock_irq(blkg->q->queue_lock);
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
if (show_total)
|
|
seq_printf(sf, "Total %llu\n", (unsigned long long)total);
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkcg_print_blkgs);
|
|
|
|
/**
|
|
* __blkg_prfill_u64 - prfill helper for a single u64 value
|
|
* @sf: seq_file to print to
|
|
* @pd: policy private data of interest
|
|
* @v: value to print
|
|
*
|
|
* Print @v to @sf for the device assocaited with @pd.
|
|
*/
|
|
u64 __blkg_prfill_u64(struct seq_file *sf, struct blkg_policy_data *pd, u64 v)
|
|
{
|
|
const char *dname = blkg_dev_name(pd->blkg);
|
|
|
|
if (!dname)
|
|
return 0;
|
|
|
|
seq_printf(sf, "%s %llu\n", dname, (unsigned long long)v);
|
|
return v;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__blkg_prfill_u64);
|
|
|
|
/**
|
|
* __blkg_prfill_rwstat - prfill helper for a blkg_rwstat
|
|
* @sf: seq_file to print to
|
|
* @pd: policy private data of interest
|
|
* @rwstat: rwstat to print
|
|
*
|
|
* Print @rwstat to @sf for the device assocaited with @pd.
|
|
*/
|
|
u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
|
|
const struct blkg_rwstat *rwstat)
|
|
{
|
|
static const char *rwstr[] = {
|
|
[BLKG_RWSTAT_READ] = "Read",
|
|
[BLKG_RWSTAT_WRITE] = "Write",
|
|
[BLKG_RWSTAT_SYNC] = "Sync",
|
|
[BLKG_RWSTAT_ASYNC] = "Async",
|
|
};
|
|
const char *dname = blkg_dev_name(pd->blkg);
|
|
u64 v;
|
|
int i;
|
|
|
|
if (!dname)
|
|
return 0;
|
|
|
|
for (i = 0; i < BLKG_RWSTAT_NR; i++)
|
|
seq_printf(sf, "%s %s %llu\n", dname, rwstr[i],
|
|
(unsigned long long)atomic64_read(&rwstat->aux_cnt[i]));
|
|
|
|
v = atomic64_read(&rwstat->aux_cnt[BLKG_RWSTAT_READ]) +
|
|
atomic64_read(&rwstat->aux_cnt[BLKG_RWSTAT_WRITE]);
|
|
seq_printf(sf, "%s Total %llu\n", dname, (unsigned long long)v);
|
|
return v;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__blkg_prfill_rwstat);
|
|
|
|
/**
|
|
* blkg_prfill_stat - prfill callback for blkg_stat
|
|
* @sf: seq_file to print to
|
|
* @pd: policy private data of interest
|
|
* @off: offset to the blkg_stat in @pd
|
|
*
|
|
* prfill callback for printing a blkg_stat.
|
|
*/
|
|
u64 blkg_prfill_stat(struct seq_file *sf, struct blkg_policy_data *pd, int off)
|
|
{
|
|
return __blkg_prfill_u64(sf, pd, blkg_stat_read((void *)pd + off));
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_prfill_stat);
|
|
|
|
/**
|
|
* blkg_prfill_rwstat - prfill callback for blkg_rwstat
|
|
* @sf: seq_file to print to
|
|
* @pd: policy private data of interest
|
|
* @off: offset to the blkg_rwstat in @pd
|
|
*
|
|
* prfill callback for printing a blkg_rwstat.
|
|
*/
|
|
u64 blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
|
|
int off)
|
|
{
|
|
struct blkg_rwstat rwstat = blkg_rwstat_read((void *)pd + off);
|
|
|
|
return __blkg_prfill_rwstat(sf, pd, &rwstat);
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_prfill_rwstat);
|
|
|
|
static u64 blkg_prfill_rwstat_field(struct seq_file *sf,
|
|
struct blkg_policy_data *pd, int off)
|
|
{
|
|
struct blkg_rwstat rwstat = blkg_rwstat_read((void *)pd->blkg + off);
|
|
|
|
return __blkg_prfill_rwstat(sf, pd, &rwstat);
|
|
}
|
|
|
|
/**
|
|
* blkg_print_stat_bytes - seq_show callback for blkg->stat_bytes
|
|
* @sf: seq_file to print to
|
|
* @v: unused
|
|
*
|
|
* To be used as cftype->seq_show to print blkg->stat_bytes.
|
|
* cftype->private must be set to the blkcg_policy.
|
|
*/
|
|
int blkg_print_stat_bytes(struct seq_file *sf, void *v)
|
|
{
|
|
blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
|
|
blkg_prfill_rwstat_field, (void *)seq_cft(sf)->private,
|
|
offsetof(struct blkcg_gq, stat_bytes), true);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_print_stat_bytes);
|
|
|
|
/**
|
|
* blkg_print_stat_bytes - seq_show callback for blkg->stat_ios
|
|
* @sf: seq_file to print to
|
|
* @v: unused
|
|
*
|
|
* To be used as cftype->seq_show to print blkg->stat_ios. cftype->private
|
|
* must be set to the blkcg_policy.
|
|
*/
|
|
int blkg_print_stat_ios(struct seq_file *sf, void *v)
|
|
{
|
|
blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
|
|
blkg_prfill_rwstat_field, (void *)seq_cft(sf)->private,
|
|
offsetof(struct blkcg_gq, stat_ios), true);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_print_stat_ios);
|
|
|
|
static u64 blkg_prfill_rwstat_field_recursive(struct seq_file *sf,
|
|
struct blkg_policy_data *pd,
|
|
int off)
|
|
{
|
|
struct blkg_rwstat rwstat = blkg_rwstat_recursive_sum(pd->blkg,
|
|
NULL, off);
|
|
return __blkg_prfill_rwstat(sf, pd, &rwstat);
|
|
}
|
|
|
|
/**
|
|
* blkg_print_stat_bytes_recursive - recursive version of blkg_print_stat_bytes
|
|
* @sf: seq_file to print to
|
|
* @v: unused
|
|
*/
|
|
int blkg_print_stat_bytes_recursive(struct seq_file *sf, void *v)
|
|
{
|
|
blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
|
|
blkg_prfill_rwstat_field_recursive,
|
|
(void *)seq_cft(sf)->private,
|
|
offsetof(struct blkcg_gq, stat_bytes), true);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_print_stat_bytes_recursive);
|
|
|
|
/**
|
|
* blkg_print_stat_ios_recursive - recursive version of blkg_print_stat_ios
|
|
* @sf: seq_file to print to
|
|
* @v: unused
|
|
*/
|
|
int blkg_print_stat_ios_recursive(struct seq_file *sf, void *v)
|
|
{
|
|
blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
|
|
blkg_prfill_rwstat_field_recursive,
|
|
(void *)seq_cft(sf)->private,
|
|
offsetof(struct blkcg_gq, stat_ios), true);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_print_stat_ios_recursive);
|
|
|
|
/**
|
|
* blkg_stat_recursive_sum - collect hierarchical blkg_stat
|
|
* @blkg: blkg of interest
|
|
* @pol: blkcg_policy which contains the blkg_stat
|
|
* @off: offset to the blkg_stat in blkg_policy_data or @blkg
|
|
*
|
|
* Collect the blkg_stat specified by @blkg, @pol and @off and all its
|
|
* online descendants and their aux counts. The caller must be holding the
|
|
* queue lock for online tests.
|
|
*
|
|
* If @pol is NULL, blkg_stat is at @off bytes into @blkg; otherwise, it is
|
|
* at @off bytes into @blkg's blkg_policy_data of the policy.
|
|
*/
|
|
u64 blkg_stat_recursive_sum(struct blkcg_gq *blkg,
|
|
struct blkcg_policy *pol, int off)
|
|
{
|
|
struct blkcg_gq *pos_blkg;
|
|
struct cgroup_subsys_state *pos_css;
|
|
u64 sum = 0;
|
|
|
|
lockdep_assert_held(blkg->q->queue_lock);
|
|
|
|
rcu_read_lock();
|
|
blkg_for_each_descendant_pre(pos_blkg, pos_css, blkg) {
|
|
struct blkg_stat *stat;
|
|
|
|
if (!pos_blkg->online)
|
|
continue;
|
|
|
|
if (pol)
|
|
stat = (void *)blkg_to_pd(pos_blkg, pol) + off;
|
|
else
|
|
stat = (void *)blkg + off;
|
|
|
|
sum += blkg_stat_read(stat) + atomic64_read(&stat->aux_cnt);
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
return sum;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_stat_recursive_sum);
|
|
|
|
/**
|
|
* blkg_rwstat_recursive_sum - collect hierarchical blkg_rwstat
|
|
* @blkg: blkg of interest
|
|
* @pol: blkcg_policy which contains the blkg_rwstat
|
|
* @off: offset to the blkg_rwstat in blkg_policy_data or @blkg
|
|
*
|
|
* Collect the blkg_rwstat specified by @blkg, @pol and @off and all its
|
|
* online descendants and their aux counts. The caller must be holding the
|
|
* queue lock for online tests.
|
|
*
|
|
* If @pol is NULL, blkg_rwstat is at @off bytes into @blkg; otherwise, it
|
|
* is at @off bytes into @blkg's blkg_policy_data of the policy.
|
|
*/
|
|
struct blkg_rwstat blkg_rwstat_recursive_sum(struct blkcg_gq *blkg,
|
|
struct blkcg_policy *pol, int off)
|
|
{
|
|
struct blkcg_gq *pos_blkg;
|
|
struct cgroup_subsys_state *pos_css;
|
|
struct blkg_rwstat sum = { };
|
|
int i;
|
|
|
|
lockdep_assert_held(blkg->q->queue_lock);
|
|
|
|
rcu_read_lock();
|
|
blkg_for_each_descendant_pre(pos_blkg, pos_css, blkg) {
|
|
struct blkg_rwstat *rwstat;
|
|
|
|
if (!pos_blkg->online)
|
|
continue;
|
|
|
|
if (pol)
|
|
rwstat = (void *)blkg_to_pd(pos_blkg, pol) + off;
|
|
else
|
|
rwstat = (void *)pos_blkg + off;
|
|
|
|
for (i = 0; i < BLKG_RWSTAT_NR; i++)
|
|
atomic64_add(atomic64_read(&rwstat->aux_cnt[i]) +
|
|
percpu_counter_sum_positive(&rwstat->cpu_cnt[i]),
|
|
&sum.aux_cnt[i]);
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
return sum;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_rwstat_recursive_sum);
|
|
|
|
/**
|
|
* blkg_conf_prep - parse and prepare for per-blkg config update
|
|
* @blkcg: target block cgroup
|
|
* @pol: target policy
|
|
* @input: input string
|
|
* @ctx: blkg_conf_ctx to be filled
|
|
*
|
|
* Parse per-blkg config update from @input and initialize @ctx with the
|
|
* result. @ctx->blkg points to the blkg to be updated and @ctx->body the
|
|
* part of @input following MAJ:MIN. This function returns with RCU read
|
|
* lock and queue lock held and must be paired with blkg_conf_finish().
|
|
*/
|
|
int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
|
|
char *input, struct blkg_conf_ctx *ctx)
|
|
__acquires(rcu) __acquires(disk->queue->queue_lock)
|
|
{
|
|
struct gendisk *disk;
|
|
struct blkcg_gq *blkg;
|
|
struct module *owner;
|
|
unsigned int major, minor;
|
|
int key_len, part, ret;
|
|
char *body;
|
|
|
|
if (sscanf(input, "%u:%u%n", &major, &minor, &key_len) != 2)
|
|
return -EINVAL;
|
|
|
|
body = input + key_len;
|
|
if (!isspace(*body))
|
|
return -EINVAL;
|
|
body = skip_spaces(body);
|
|
|
|
disk = get_gendisk(MKDEV(major, minor), &part);
|
|
if (!disk)
|
|
return -ENODEV;
|
|
if (part) {
|
|
owner = disk->fops->owner;
|
|
put_disk(disk);
|
|
module_put(owner);
|
|
return -ENODEV;
|
|
}
|
|
|
|
rcu_read_lock();
|
|
spin_lock_irq(disk->queue->queue_lock);
|
|
|
|
if (blkcg_policy_enabled(disk->queue, pol))
|
|
blkg = blkg_lookup_create(blkcg, disk->queue);
|
|
else
|
|
blkg = ERR_PTR(-EOPNOTSUPP);
|
|
|
|
if (IS_ERR(blkg)) {
|
|
ret = PTR_ERR(blkg);
|
|
rcu_read_unlock();
|
|
spin_unlock_irq(disk->queue->queue_lock);
|
|
owner = disk->fops->owner;
|
|
put_disk(disk);
|
|
module_put(owner);
|
|
/*
|
|
* If queue was bypassing, we should retry. Do so after a
|
|
* short msleep(). It isn't strictly necessary but queue
|
|
* can be bypassing for some time and it's always nice to
|
|
* avoid busy looping.
|
|
*/
|
|
if (ret == -EBUSY) {
|
|
msleep(10);
|
|
ret = restart_syscall();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
ctx->disk = disk;
|
|
ctx->blkg = blkg;
|
|
ctx->body = body;
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_conf_prep);
|
|
|
|
/**
|
|
* blkg_conf_finish - finish up per-blkg config update
|
|
* @ctx: blkg_conf_ctx intiailized by blkg_conf_prep()
|
|
*
|
|
* Finish up after per-blkg config update. This function must be paired
|
|
* with blkg_conf_prep().
|
|
*/
|
|
void blkg_conf_finish(struct blkg_conf_ctx *ctx)
|
|
__releases(ctx->disk->queue->queue_lock) __releases(rcu)
|
|
{
|
|
struct module *owner;
|
|
|
|
spin_unlock_irq(ctx->disk->queue->queue_lock);
|
|
rcu_read_unlock();
|
|
owner = ctx->disk->fops->owner;
|
|
put_disk(ctx->disk);
|
|
module_put(owner);
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkg_conf_finish);
|
|
|
|
static int blkcg_print_stat(struct seq_file *sf, void *v)
|
|
{
|
|
struct blkcg *blkcg = css_to_blkcg(seq_css(sf));
|
|
struct blkcg_gq *blkg;
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) {
|
|
const char *dname;
|
|
struct blkg_rwstat rwstat;
|
|
u64 rbytes, wbytes, rios, wios;
|
|
|
|
dname = blkg_dev_name(blkg);
|
|
if (!dname)
|
|
continue;
|
|
|
|
spin_lock_irq(blkg->q->queue_lock);
|
|
|
|
rwstat = blkg_rwstat_recursive_sum(blkg, NULL,
|
|
offsetof(struct blkcg_gq, stat_bytes));
|
|
rbytes = atomic64_read(&rwstat.aux_cnt[BLKG_RWSTAT_READ]);
|
|
wbytes = atomic64_read(&rwstat.aux_cnt[BLKG_RWSTAT_WRITE]);
|
|
|
|
rwstat = blkg_rwstat_recursive_sum(blkg, NULL,
|
|
offsetof(struct blkcg_gq, stat_ios));
|
|
rios = atomic64_read(&rwstat.aux_cnt[BLKG_RWSTAT_READ]);
|
|
wios = atomic64_read(&rwstat.aux_cnt[BLKG_RWSTAT_WRITE]);
|
|
|
|
spin_unlock_irq(blkg->q->queue_lock);
|
|
|
|
if (rbytes || wbytes || rios || wios)
|
|
seq_printf(sf, "%s rbytes=%llu wbytes=%llu rios=%llu wios=%llu\n",
|
|
dname, rbytes, wbytes, rios, wios);
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
return 0;
|
|
}
|
|
|
|
struct cftype blkcg_files[] = {
|
|
{
|
|
.name = "stat",
|
|
.flags = CFTYPE_NOT_ON_ROOT,
|
|
.seq_show = blkcg_print_stat,
|
|
},
|
|
{ } /* terminate */
|
|
};
|
|
|
|
struct cftype blkcg_legacy_files[] = {
|
|
{
|
|
.name = "reset_stats",
|
|
.write_u64 = blkcg_reset_stats,
|
|
},
|
|
{ } /* terminate */
|
|
};
|
|
|
|
/**
|
|
* blkcg_css_offline - cgroup css_offline callback
|
|
* @css: css of interest
|
|
*
|
|
* This function is called when @css is about to go away and responsible
|
|
* for shooting down all blkgs associated with @css. blkgs should be
|
|
* removed while holding both q and blkcg locks. As blkcg lock is nested
|
|
* inside q lock, this function performs reverse double lock dancing.
|
|
*
|
|
* This is the blkcg counterpart of ioc_release_fn().
|
|
*/
|
|
static void blkcg_css_offline(struct cgroup_subsys_state *css)
|
|
{
|
|
struct blkcg *blkcg = css_to_blkcg(css);
|
|
|
|
spin_lock_irq(&blkcg->lock);
|
|
|
|
while (!hlist_empty(&blkcg->blkg_list)) {
|
|
struct blkcg_gq *blkg = hlist_entry(blkcg->blkg_list.first,
|
|
struct blkcg_gq, blkcg_node);
|
|
struct request_queue *q = blkg->q;
|
|
|
|
if (spin_trylock(q->queue_lock)) {
|
|
blkg_destroy(blkg);
|
|
spin_unlock(q->queue_lock);
|
|
} else {
|
|
spin_unlock_irq(&blkcg->lock);
|
|
cpu_relax();
|
|
spin_lock_irq(&blkcg->lock);
|
|
}
|
|
}
|
|
|
|
spin_unlock_irq(&blkcg->lock);
|
|
|
|
wb_blkcg_offline(blkcg);
|
|
}
|
|
|
|
static void blkcg_css_free(struct cgroup_subsys_state *css)
|
|
{
|
|
struct blkcg *blkcg = css_to_blkcg(css);
|
|
int i;
|
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
list_del(&blkcg->all_blkcgs_node);
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++)
|
|
if (blkcg->cpd[i])
|
|
blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]);
|
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
|
|
kfree(blkcg);
|
|
}
|
|
|
|
static struct cgroup_subsys_state *
|
|
blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
|
|
{
|
|
struct blkcg *blkcg;
|
|
struct cgroup_subsys_state *ret;
|
|
int i;
|
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
if (!parent_css) {
|
|
blkcg = &blkcg_root;
|
|
} else {
|
|
blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);
|
|
if (!blkcg) {
|
|
ret = ERR_PTR(-ENOMEM);
|
|
goto free_blkcg;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS ; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
struct blkcg_policy_data *cpd;
|
|
|
|
/*
|
|
* If the policy hasn't been attached yet, wait for it
|
|
* to be attached before doing anything else. Otherwise,
|
|
* check if the policy requires any specific per-cgroup
|
|
* data: if it does, allocate and initialize it.
|
|
*/
|
|
if (!pol || !pol->cpd_alloc_fn)
|
|
continue;
|
|
|
|
cpd = pol->cpd_alloc_fn(GFP_KERNEL);
|
|
if (!cpd) {
|
|
ret = ERR_PTR(-ENOMEM);
|
|
goto free_pd_blkcg;
|
|
}
|
|
blkcg->cpd[i] = cpd;
|
|
cpd->blkcg = blkcg;
|
|
cpd->plid = i;
|
|
if (pol->cpd_init_fn)
|
|
pol->cpd_init_fn(cpd);
|
|
}
|
|
|
|
spin_lock_init(&blkcg->lock);
|
|
INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_NOWAIT);
|
|
INIT_HLIST_HEAD(&blkcg->blkg_list);
|
|
#ifdef CONFIG_CGROUP_WRITEBACK
|
|
INIT_LIST_HEAD(&blkcg->cgwb_list);
|
|
#endif
|
|
list_add_tail(&blkcg->all_blkcgs_node, &all_blkcgs);
|
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
return &blkcg->css;
|
|
|
|
free_pd_blkcg:
|
|
for (i--; i >= 0; i--)
|
|
if (blkcg->cpd[i])
|
|
blkcg_policy[i]->cpd_free_fn(blkcg->cpd[i]);
|
|
free_blkcg:
|
|
kfree(blkcg);
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* blkcg_init_queue - initialize blkcg part of request queue
|
|
* @q: request_queue to initialize
|
|
*
|
|
* Called from blk_alloc_queue_node(). Responsible for initializing blkcg
|
|
* part of new request_queue @q.
|
|
*
|
|
* RETURNS:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
int blkcg_init_queue(struct request_queue *q)
|
|
{
|
|
struct blkcg_gq *new_blkg, *blkg;
|
|
bool preloaded;
|
|
int ret;
|
|
|
|
new_blkg = blkg_alloc(&blkcg_root, q, GFP_KERNEL);
|
|
if (!new_blkg)
|
|
return -ENOMEM;
|
|
|
|
preloaded = !radix_tree_preload(GFP_KERNEL);
|
|
|
|
/*
|
|
* Make sure the root blkg exists and count the existing blkgs. As
|
|
* @q is bypassing at this point, blkg_lookup_create() can't be
|
|
* used. Open code insertion.
|
|
*/
|
|
rcu_read_lock();
|
|
spin_lock_irq(q->queue_lock);
|
|
blkg = blkg_create(&blkcg_root, q, new_blkg);
|
|
spin_unlock_irq(q->queue_lock);
|
|
rcu_read_unlock();
|
|
|
|
if (preloaded)
|
|
radix_tree_preload_end();
|
|
|
|
if (IS_ERR(blkg))
|
|
return PTR_ERR(blkg);
|
|
|
|
q->root_blkg = blkg;
|
|
q->root_rl.blkg = blkg;
|
|
|
|
ret = blk_throtl_init(q);
|
|
if (ret) {
|
|
spin_lock_irq(q->queue_lock);
|
|
blkg_destroy_all(q);
|
|
spin_unlock_irq(q->queue_lock);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* blkcg_drain_queue - drain blkcg part of request_queue
|
|
* @q: request_queue to drain
|
|
*
|
|
* Called from blk_drain_queue(). Responsible for draining blkcg part.
|
|
*/
|
|
void blkcg_drain_queue(struct request_queue *q)
|
|
{
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
/*
|
|
* @q could be exiting and already have destroyed all blkgs as
|
|
* indicated by NULL root_blkg. If so, don't confuse policies.
|
|
*/
|
|
if (!q->root_blkg)
|
|
return;
|
|
|
|
blk_throtl_drain(q);
|
|
}
|
|
|
|
/**
|
|
* blkcg_exit_queue - exit and release blkcg part of request_queue
|
|
* @q: request_queue being released
|
|
*
|
|
* Called from blk_release_queue(). Responsible for exiting blkcg part.
|
|
*/
|
|
void blkcg_exit_queue(struct request_queue *q)
|
|
{
|
|
spin_lock_irq(q->queue_lock);
|
|
blkg_destroy_all(q);
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
blk_throtl_exit(q);
|
|
}
|
|
|
|
/*
|
|
* We cannot support shared io contexts, as we have no mean to support
|
|
* two tasks with the same ioc in two different groups without major rework
|
|
* of the main cic data structures. For now we allow a task to change
|
|
* its cgroup only if it's the only owner of its ioc.
|
|
*/
|
|
static int blkcg_can_attach(struct cgroup_taskset *tset)
|
|
{
|
|
struct task_struct *task;
|
|
struct cgroup_subsys_state *dst_css;
|
|
struct io_context *ioc;
|
|
int ret = 0;
|
|
|
|
/* task_lock() is needed to avoid races with exit_io_context() */
|
|
cgroup_taskset_for_each(task, dst_css, tset) {
|
|
task_lock(task);
|
|
ioc = task->io_context;
|
|
if (ioc && atomic_read(&ioc->nr_tasks) > 1)
|
|
ret = -EINVAL;
|
|
task_unlock(task);
|
|
if (ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void blkcg_bind(struct cgroup_subsys_state *root_css)
|
|
{
|
|
int i;
|
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
struct blkcg *blkcg;
|
|
|
|
if (!pol || !pol->cpd_bind_fn)
|
|
continue;
|
|
|
|
list_for_each_entry(blkcg, &all_blkcgs, all_blkcgs_node)
|
|
if (blkcg->cpd[pol->plid])
|
|
pol->cpd_bind_fn(blkcg->cpd[pol->plid]);
|
|
}
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
}
|
|
|
|
struct cgroup_subsys io_cgrp_subsys = {
|
|
.css_alloc = blkcg_css_alloc,
|
|
.css_offline = blkcg_css_offline,
|
|
.css_free = blkcg_css_free,
|
|
.can_attach = blkcg_can_attach,
|
|
.bind = blkcg_bind,
|
|
.dfl_cftypes = blkcg_files,
|
|
.legacy_cftypes = blkcg_legacy_files,
|
|
.legacy_name = "blkio",
|
|
#ifdef CONFIG_MEMCG
|
|
/*
|
|
* This ensures that, if available, memcg is automatically enabled
|
|
* together on the default hierarchy so that the owner cgroup can
|
|
* be retrieved from writeback pages.
|
|
*/
|
|
.depends_on = 1 << memory_cgrp_id,
|
|
#endif
|
|
};
|
|
EXPORT_SYMBOL_GPL(io_cgrp_subsys);
|
|
|
|
/**
|
|
* blkcg_activate_policy - activate a blkcg policy on a request_queue
|
|
* @q: request_queue of interest
|
|
* @pol: blkcg policy to activate
|
|
*
|
|
* Activate @pol on @q. Requires %GFP_KERNEL context. @q goes through
|
|
* bypass mode to populate its blkgs with policy_data for @pol.
|
|
*
|
|
* Activation happens with @q bypassed, so nobody would be accessing blkgs
|
|
* from IO path. Update of each blkg is protected by both queue and blkcg
|
|
* locks so that holding either lock and testing blkcg_policy_enabled() is
|
|
* always enough for dereferencing policy data.
|
|
*
|
|
* The caller is responsible for synchronizing [de]activations and policy
|
|
* [un]registerations. Returns 0 on success, -errno on failure.
|
|
*/
|
|
int blkcg_activate_policy(struct request_queue *q,
|
|
const struct blkcg_policy *pol)
|
|
{
|
|
struct blkg_policy_data *pd_prealloc = NULL;
|
|
struct blkcg_gq *blkg;
|
|
int ret;
|
|
|
|
if (blkcg_policy_enabled(q, pol))
|
|
return 0;
|
|
|
|
blk_queue_bypass_start(q);
|
|
pd_prealloc:
|
|
if (!pd_prealloc) {
|
|
pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node);
|
|
if (!pd_prealloc) {
|
|
ret = -ENOMEM;
|
|
goto out_bypass_end;
|
|
}
|
|
}
|
|
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
list_for_each_entry(blkg, &q->blkg_list, q_node) {
|
|
struct blkg_policy_data *pd;
|
|
|
|
if (blkg->pd[pol->plid])
|
|
continue;
|
|
|
|
pd = pol->pd_alloc_fn(GFP_NOWAIT, q->node);
|
|
if (!pd)
|
|
swap(pd, pd_prealloc);
|
|
if (!pd) {
|
|
spin_unlock_irq(q->queue_lock);
|
|
goto pd_prealloc;
|
|
}
|
|
|
|
blkg->pd[pol->plid] = pd;
|
|
pd->blkg = blkg;
|
|
pd->plid = pol->plid;
|
|
if (pol->pd_init_fn)
|
|
pol->pd_init_fn(pd);
|
|
}
|
|
|
|
__set_bit(pol->plid, q->blkcg_pols);
|
|
ret = 0;
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
out_bypass_end:
|
|
blk_queue_bypass_end(q);
|
|
if (pd_prealloc)
|
|
pol->pd_free_fn(pd_prealloc);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkcg_activate_policy);
|
|
|
|
/**
|
|
* blkcg_deactivate_policy - deactivate a blkcg policy on a request_queue
|
|
* @q: request_queue of interest
|
|
* @pol: blkcg policy to deactivate
|
|
*
|
|
* Deactivate @pol on @q. Follows the same synchronization rules as
|
|
* blkcg_activate_policy().
|
|
*/
|
|
void blkcg_deactivate_policy(struct request_queue *q,
|
|
const struct blkcg_policy *pol)
|
|
{
|
|
struct blkcg_gq *blkg;
|
|
|
|
if (!blkcg_policy_enabled(q, pol))
|
|
return;
|
|
|
|
blk_queue_bypass_start(q);
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
__clear_bit(pol->plid, q->blkcg_pols);
|
|
|
|
list_for_each_entry(blkg, &q->blkg_list, q_node) {
|
|
/* grab blkcg lock too while removing @pd from @blkg */
|
|
spin_lock(&blkg->blkcg->lock);
|
|
|
|
if (blkg->pd[pol->plid]) {
|
|
if (pol->pd_offline_fn)
|
|
pol->pd_offline_fn(blkg->pd[pol->plid]);
|
|
pol->pd_free_fn(blkg->pd[pol->plid]);
|
|
blkg->pd[pol->plid] = NULL;
|
|
}
|
|
|
|
spin_unlock(&blkg->blkcg->lock);
|
|
}
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
blk_queue_bypass_end(q);
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);
|
|
|
|
/**
|
|
* blkcg_policy_register - register a blkcg policy
|
|
* @pol: blkcg policy to register
|
|
*
|
|
* Register @pol with blkcg core. Might sleep and @pol may be modified on
|
|
* successful registration. Returns 0 on success and -errno on failure.
|
|
*/
|
|
int blkcg_policy_register(struct blkcg_policy *pol)
|
|
{
|
|
struct blkcg *blkcg;
|
|
int i, ret;
|
|
|
|
mutex_lock(&blkcg_pol_register_mutex);
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
/* find an empty slot */
|
|
ret = -ENOSPC;
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++)
|
|
if (!blkcg_policy[i])
|
|
break;
|
|
if (i >= BLKCG_MAX_POLS)
|
|
goto err_unlock;
|
|
|
|
/* register @pol */
|
|
pol->plid = i;
|
|
blkcg_policy[pol->plid] = pol;
|
|
|
|
/* allocate and install cpd's */
|
|
if (pol->cpd_alloc_fn) {
|
|
list_for_each_entry(blkcg, &all_blkcgs, all_blkcgs_node) {
|
|
struct blkcg_policy_data *cpd;
|
|
|
|
cpd = pol->cpd_alloc_fn(GFP_KERNEL);
|
|
if (!cpd)
|
|
goto err_free_cpds;
|
|
|
|
blkcg->cpd[pol->plid] = cpd;
|
|
cpd->blkcg = blkcg;
|
|
cpd->plid = pol->plid;
|
|
pol->cpd_init_fn(cpd);
|
|
}
|
|
}
|
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
|
|
/* everything is in place, add intf files for the new policy */
|
|
if (pol->dfl_cftypes)
|
|
WARN_ON(cgroup_add_dfl_cftypes(&io_cgrp_subsys,
|
|
pol->dfl_cftypes));
|
|
if (pol->legacy_cftypes)
|
|
WARN_ON(cgroup_add_legacy_cftypes(&io_cgrp_subsys,
|
|
pol->legacy_cftypes));
|
|
mutex_unlock(&blkcg_pol_register_mutex);
|
|
return 0;
|
|
|
|
err_free_cpds:
|
|
if (pol->cpd_alloc_fn) {
|
|
list_for_each_entry(blkcg, &all_blkcgs, all_blkcgs_node) {
|
|
if (blkcg->cpd[pol->plid]) {
|
|
pol->cpd_free_fn(blkcg->cpd[pol->plid]);
|
|
blkcg->cpd[pol->plid] = NULL;
|
|
}
|
|
}
|
|
}
|
|
blkcg_policy[pol->plid] = NULL;
|
|
err_unlock:
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
mutex_unlock(&blkcg_pol_register_mutex);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkcg_policy_register);
|
|
|
|
/**
|
|
* blkcg_policy_unregister - unregister a blkcg policy
|
|
* @pol: blkcg policy to unregister
|
|
*
|
|
* Undo blkcg_policy_register(@pol). Might sleep.
|
|
*/
|
|
void blkcg_policy_unregister(struct blkcg_policy *pol)
|
|
{
|
|
struct blkcg *blkcg;
|
|
|
|
mutex_lock(&blkcg_pol_register_mutex);
|
|
|
|
if (WARN_ON(blkcg_policy[pol->plid] != pol))
|
|
goto out_unlock;
|
|
|
|
/* kill the intf files first */
|
|
if (pol->dfl_cftypes)
|
|
cgroup_rm_cftypes(pol->dfl_cftypes);
|
|
if (pol->legacy_cftypes)
|
|
cgroup_rm_cftypes(pol->legacy_cftypes);
|
|
|
|
/* remove cpds and unregister */
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
if (pol->cpd_alloc_fn) {
|
|
list_for_each_entry(blkcg, &all_blkcgs, all_blkcgs_node) {
|
|
if (blkcg->cpd[pol->plid]) {
|
|
pol->cpd_free_fn(blkcg->cpd[pol->plid]);
|
|
blkcg->cpd[pol->plid] = NULL;
|
|
}
|
|
}
|
|
}
|
|
blkcg_policy[pol->plid] = NULL;
|
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
|
out_unlock:
|
|
mutex_unlock(&blkcg_pol_register_mutex);
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkcg_policy_unregister);
|