Changes in 4.9.212 xfs: Sanity check flags of Q_XQUOTARM call powerpc/archrandom: fix arch_get_random_seed_int() mt7601u: fix bbp version check in mt7601u_wait_bbp_ready drm/sti: do not remove the drm_bridge that was never added drm/virtio: fix bounds check in virtio_gpu_cmd_get_capset() ALSA: hda: fix unused variable warning IB/rxe: replace kvfree with vfree ALSA: usb-audio: update quirk for B&W PX to remove microphone staging: comedi: ni_mio_common: protect register write overflow pwm: lpss: Release runtime-pm reference from the driver's remove callback mlxsw: reg: QEEC: Add minimum shaper fields pcrypt: use format specifier in kobject_add exportfs: fix 'passing zero to ERR_PTR()' warning drm/dp_mst: Skip validating ports during destruction, just ref net: phy: Fix not to call phy_resume() if PHY is not attached pinctrl: sh-pfc: r8a7740: Add missing REF125CK pin to gether_gmii group pinctrl: sh-pfc: r8a7740: Add missing LCD0 marks to lcd0_data24_1 group pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group pinctrl: sh-pfc: r8a7791: Remove bogus marks from vin1_b_data18 group pinctrl: sh-pfc: sh73a0: Add missing TO pin to tpu4_to3 group pinctrl: sh-pfc: r8a7794: Remove bogus IPSR9 field pinctrl: sh-pfc: sh7734: Add missing IPSR11 field pinctrl: sh-pfc: sh7269: Add missing PCIOR0 field pinctrl: sh-pfc: sh7734: Remove bogus IPSR10 value Input: nomadik-ske-keypad - fix a loop timeout test clk: highbank: fix refcount leak in hb_clk_init() clk: qoriq: fix refcount leak in clockgen_init() clk: socfpga: fix refcount leak clk: samsung: exynos4: fix refcount leak in exynos4_get_xom() clk: imx6q: fix refcount leak in imx6q_clocks_init() clk: imx6sx: fix refcount leak in imx6sx_clocks_init() clk: imx7d: fix refcount leak in imx7d_clocks_init() clk: vf610: fix refcount leak in vf610_clocks_init() clk: armada-370: fix refcount leak in a370_clk_init() clk: kirkwood: fix refcount leak in kirkwood_clk_init() clk: armada-xp: fix refcount leak in axp_clk_init() clk: dove: fix refcount leak in dove_clk_init() IB/usnic: Fix out of bounds index check in query pkey RDMA/ocrdma: Fix out of bounds index check in query pkey RDMA/qedr: Fix out of bounds index check in query pkey arm64: dts: apq8016-sbc: Increase load on l11 for SDCARD drm/etnaviv: NULL vs IS_ERR() buf in etnaviv_core_dump() media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL crypto: tgr192 - fix unaligned memory access ASoC: imx-sgtl5000: put of nodes if finding codec fails IB/iser: Pass the correct number of entries for dma mapped SGL rtc: cmos: ignore bogus century byte clk: sunxi-ng: sun8i-a23: Enable PLL-MIPI LDOs when ungating it iwlwifi: mvm: fix A-MPDU reference assignment tty: ipwireless: Fix potential NULL pointer dereference crypto: crypto4xx - Fix wrong ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments ARM: dts: lpc32xx: add required clocks property to keypad device node ARM: dts: lpc32xx: reparent keypad controller to SIC1 ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller variant ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage iwlwifi: mvm: fix RSS config command staging: most: cdev: add missing check for cdev_add failure rtc: ds1672: fix unintended sign extension thermal: mediatek: fix register index error net: phy: fixed_phy: Fix fixed_phy not checking GPIO rtc: 88pm860x: fix unintended sign extension rtc: 88pm80x: fix unintended sign extension rtc: pm8xxx: fix unintended sign extension fbdev: chipsfb: remove set but not used variable 'size' iw_cxgb4: use tos when importing the endpoint iw_cxgb4: use tos when finding ipv6 routes pinctrl: sh-pfc: emev2: Add missing pinmux functions pinctrl: sh-pfc: r8a7791: Fix scifb2_data_c pin group pinctrl: sh-pfc: r8a7792: Fix vin1_data18_b pin group pinctrl: sh-pfc: sh73a0: Fix fsic_spdif pin groups usb: phy: twl6030-usb: fix possible use-after-free on remove block: don't use bio->bi_vcnt to figure out segment number keys: Timestamp new keys vfio_pci: Enable memory accesses before calling pci_map_rom dmaengine: mv_xor: Use correct device for DMA API cdc-wdm: pass return value of recover_from_urb_loss regulator: pv88060: Fix array out-of-bounds access regulator: pv88080: Fix array out-of-bounds access regulator: pv88090: Fix array out-of-bounds access net: dsa: qca8k: Enable delay for RGMII_ID mode drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON drm/nouveau/pmu: don't print reply values if exec is false ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of() fs/nfs: Fix nfs_parse_devname to not modify it's argument NFS: Fix a soft lockup in the delegation recovery code clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable clocksource/drivers/exynos_mct: Fix error path in timer resources initialization mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe ARM: 8847/1: pm: fix HYP/SVC mode mismatch when MCPM is used ARM: 8848/1: virt: Align GIC version check with arm64 counterpart regulator: wm831x-dcdc: Fix list of wm831x_dcdc_ilim from mA to uA nios2: ksyms: Add missing symbol exports scsi: megaraid_sas: reduce module load time drivers/rapidio/rio_cm.c: fix potential oops in riocm_ch_listen() xen, cpu_hotplug: Prevent an out of bounds access net: sh_eth: fix a missing check of of_get_phy_mode media: ivtv: update *pos correctly in ivtv_read_pos() media: cx18: update *pos correctly in cx18_read_pos() media: wl128x: Fix an error code in fm_download_firmware() media: cx23885: check allocation return regulator: tps65086: Fix tps65086_ldoa1_ranges for selector 0xB jfs: fix bogus variable self-initialization tipc: tipc clang warning m68k: mac: Fix VIA timer counter accesses ARM: OMAP2+: Fix potentially uninitialized return value for _setup_reset() media: davinci-isif: avoid uninitialized variable use media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame spi: tegra114: clear packed bit for unpacked mode spi: tegra114: fix for unpacked mode transfers soc/fsl/qe: Fix an error code in qe_pin_request() spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios ehea: Fix a copy-paste err in ehea_init_port_res scsi: qla2xxx: Unregister chrdev if module initialization fails ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data" hwmon: (w83627hf) Use request_muxed_region for Super-IO accesses tipc: set sysctl_tipc_rmem and named_timeout right range powerpc: vdso: Make vdso32 installation conditional in vdso_install ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect media: ov2659: fix unbalanced mutex_lock/unlock 6lowpan: Off by one handling ->nexthdr dmaengine: axi-dmac: Don't check the number of frames for alignment ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk() packet: in recvmsg msg_name return at least sizeof sockaddr_ll ASoC: fix valid stream condition usb: gadget: fsl: fix link error against usb-gadget module IB/mlx5: Add missing XRC options to QP optional params mask iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU net: ena: fix swapped parameters when calling ena_com_indirect_table_fill_entry net: ena: fix: Free napi resources when ena_up() fails net: ena: fix incorrect test of supported hash function net: ena: fix ena_com_fill_hash_function() implementation dmaengine: tegra210-adma: restore channel status l2tp: Fix possible NULL pointer dereference media: omap_vout: potential buffer overflow in vidioc_dqbuf() media: davinci/vpbe: array underflow in vpbe_enum_outputs() platform/x86: alienware-wmi: printing the wrong error code netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule pwm: meson: Don't disable PWM when setting duty repeatedly ARM: riscpc: fix lack of keyboard interrupts after irq conversion kdb: do a sanity check on the cpu in kdb_per_cpu() backlight: lm3630a: Return 0 on success in update_status functions thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power dmaengine: tegra210-adma: Fix crash during probe spi: spi-fsl-spi: call spi_finalize_current_message() at the end crypto: ccp - fix AES CFB error exposed by new test vectors serial: stm32: fix transmit_chars when tx is stopped misc: sgi-xp: Properly initialize buf in xpc_get_rsvd_page_pa iommu: Use right function to get group for device signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig inet: frags: call inet_frags_fini() after unregister_pernet_subsys() media: vivid: fix incorrect assignment operation when setting video mode powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild drm/msm/mdp5: Fix mdp5_cfg_init error return net: netem: fix backlog accounting for corrupted GSO frames net/af_iucv: always register net_device notifier ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs rtc: pcf8563: Clear event flags and disable interrupts before requesting irq drm/msm/a3xx: remove TPL1 regs from snapshot perf/ioctl: Add check for the sample_period value dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width" clk: qcom: Fix -Wunused-const-variable iommu/amd: Make iommu_disable safer mfd: intel-lpss: Release IDA resources rxrpc: Fix uninitialized error code in rxrpc_send_data_packet() devres: allow const resource arguments RDMA/hns: Fixs hw access invalid dma memory error net: pasemi: fix an use-after-free in pasemi_mac_phy_init() scsi: libfc: fix null pointer dereference on a null lport libertas_tf: Use correct channel range in lbtf_geo_init qed: reduce maximum stack frame size usb: host: xhci-hub: fix extra endianness conversion mic: avoid statically declaring a 'struct device'. x86/kgbd: Use NMI_VECTOR not APIC_DM_NMI ALSA: aoa: onyx: always initialize register read value net/mlx5: Fix mlx5_ifc_query_lag_out_bits cifs: fix rmmod regression in cifs.ko caused by force_sig changes crypto: caam - free resources in case caam_rng registration failed ext4: set error return correctly when ext4_htree_store_dirent fails ASoC: es8328: Fix copy-paste error in es8328_right_line_controls ASoC: cs4349: Use PM ops 'cs4349_runtime_pm' ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls signal: Allow cifs and drbd to receive their terminating signals ASoC: sun4i-i2s: RX and TX counter registers are swapped dmaengine: dw: platform: Switch to acpi_dma_controller_register() mac80211: minstrel_ht: fix per-group max throughput rate initialization mips: avoid explicit UB in assignment of mips_io_port_base ahci: Do not export local variable ahci_em_messages Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()" hwmon: (lm75) Fix write operations for negative temperatures power: supply: Init device wakeup after device_add() x86, perf: Fix the dependency of the x86 insn decoder selftest staging: greybus: light: fix a couple double frees bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA iio: dac: ad5380: fix incorrect assignment to val ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init net: sonic: return NETDEV_TX_OK if failed to map buffer Btrfs: fix hang when loading existing inode cache off disk hwmon: (shtc1) fix shtc1 and shtw1 id mask net: sonic: replace dev_kfree_skb in sonic_send_packet net/rds: Fix 'ib_evt_handler_call' element in 'rds_ib_stat_names' iommu/amd: Wait for completion of IOTLB flush in attach_device net: hisilicon: Fix signedness bug in hix5hd2_dev_probe() net: broadcom/bcmsysport: Fix signedness in bcm_sysport_probe() net: stmmac: dwmac-meson8b: Fix signedness bug in probe of: mdio: Fix a signedness bug in of_phy_get_and_connect() net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse() nvme: retain split access workaround for capability reads net: stmmac: gmac4+: Not all Unicast addresses may be available mac80211: accept deauth frames in IBSS mode llc: fix another potential sk_buff leak in llc_ui_sendmsg() llc: fix sk_buff refcounting in llc_conn_state_process() net: stmmac: fix length of PTP clock's name string act_mirred: Fix mirred_init_module error handling drm/msm/dsi: Implement reset correctly dmaengine: imx-sdma: fix size check for sdma script_number net: netem: fix error path for corrupted GSO frames net: netem: correct the parent's backlog when corrupted packet was dropped net: qca_spi: Move reset_count to struct qcaspi afs: Fix large file support media: ov6650: Fix incorrect use of JPEG colorspace media: ov6650: Fix some format attributes not under control media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support MIPS: Loongson: Fix return value of loongson_hwmon_init net: neigh: use long type to store jiffies delta packet: fix data-race in fanout_flow_is_huge() dmaengine: ti: edma: fix missed failure handling drm/radeon: fix bad DMA from INTERRUPT_CNTL2 arm64: dts: juno: Fix UART frequency IB/iser: Fix dma_nents type definition m68k: Call timer_interrupt() with interrupts disabled net: ethtool: Add back transceiver type net: phy: Keep reporting transceiver type can, slip: Protect tty->disc_data in write_wakeup and close with RCU firestream: fix memory leaks net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM net, ip6_tunnel: fix namespaces move net, ip_tunnel: fix namespaces move net_sched: fix datalen for ematch tcp_bbr: improve arithmetic division in bbr_update_bw() net: usb: lan78xx: Add .ndo_features_check gtp: make sure only SOCK_DGRAM UDP sockets are accepted hwmon: (adt7475) Make volt2reg return same reg as reg2volt input hwmon: (core) Simplify sysfs attribute name allocation hwmon: Deal with errors from the thermal subsystem hwmon: (core) Fix double-free in __hwmon_device_register() hwmon: (core) Do not use device managed functions for memory allocations Input: keyspan-remote - fix control-message timeouts ARM: 8950/1: ftrace/recordmcount: filter relocation types mmc: tegra: fix SDR50 tuning override mmc: sdhci: fix minimum clock rate for v3 controller Input: sur40 - fix interface sanity checks Input: gtco - fix endpoint sanity check Input: aiptek - fix endpoint sanity check Input: pegasus_notetaker - fix endpoint sanity check Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register hwmon: (nct7802) Fix voltage limits to wrong registers scsi: RDMA/isert: Fix a recently introduced regression related to logout tracing: xen: Ordered comparison of function pointers do_last(): fetch directory ->i_mode and ->i_uid before it's too late Documentation: Document arm64 kpti control arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field coresight: etb10: Do not call smp_processor_id from preemptible coresight: tmc-etf: Do not call smp_processor_id from preemptible libertas: Fix two buffer overflows at parsing bss descriptor bcache: silence static checker warning scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func md: Avoid namespace collision with bitmap API bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free() netfilter: ipset: use bitmap infrastructure completely net/x25: fix nonblocking connect Linux 4.9.212 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I2e83a05c5f119a7467a4d6984045d45d0c06b764
812 lines
20 KiB
C
812 lines
20 KiB
C
/*
|
|
* Functions related to segment and merge handling
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/bio.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include <trace/events/block.h>
|
|
|
|
#include "blk.h"
|
|
|
|
static struct bio *blk_bio_discard_split(struct request_queue *q,
|
|
struct bio *bio,
|
|
struct bio_set *bs,
|
|
unsigned *nsegs)
|
|
{
|
|
unsigned int max_discard_sectors, granularity;
|
|
int alignment;
|
|
sector_t tmp;
|
|
unsigned split_sectors;
|
|
|
|
*nsegs = 1;
|
|
|
|
/* Zero-sector (unknown) and one-sector granularities are the same. */
|
|
granularity = max(q->limits.discard_granularity >> 9, 1U);
|
|
|
|
max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9);
|
|
max_discard_sectors -= max_discard_sectors % granularity;
|
|
|
|
if (unlikely(!max_discard_sectors)) {
|
|
/* XXX: warn */
|
|
return NULL;
|
|
}
|
|
|
|
if (bio_sectors(bio) <= max_discard_sectors)
|
|
return NULL;
|
|
|
|
split_sectors = max_discard_sectors;
|
|
|
|
/*
|
|
* If the next starting sector would be misaligned, stop the discard at
|
|
* the previous aligned sector.
|
|
*/
|
|
alignment = (q->limits.discard_alignment >> 9) % granularity;
|
|
|
|
tmp = bio->bi_iter.bi_sector + split_sectors - alignment;
|
|
tmp = sector_div(tmp, granularity);
|
|
|
|
if (split_sectors > tmp)
|
|
split_sectors -= tmp;
|
|
|
|
return bio_split(bio, split_sectors, GFP_NOIO, bs);
|
|
}
|
|
|
|
static struct bio *blk_bio_write_same_split(struct request_queue *q,
|
|
struct bio *bio,
|
|
struct bio_set *bs,
|
|
unsigned *nsegs)
|
|
{
|
|
*nsegs = 1;
|
|
|
|
if (!q->limits.max_write_same_sectors)
|
|
return NULL;
|
|
|
|
if (bio_sectors(bio) <= q->limits.max_write_same_sectors)
|
|
return NULL;
|
|
|
|
return bio_split(bio, q->limits.max_write_same_sectors, GFP_NOIO, bs);
|
|
}
|
|
|
|
static inline unsigned get_max_io_size(struct request_queue *q,
|
|
struct bio *bio)
|
|
{
|
|
unsigned sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector);
|
|
unsigned mask = queue_logical_block_size(q) - 1;
|
|
|
|
/* aligned to logical block size */
|
|
sectors &= ~(mask >> 9);
|
|
|
|
return sectors;
|
|
}
|
|
|
|
static struct bio *blk_bio_segment_split(struct request_queue *q,
|
|
struct bio *bio,
|
|
struct bio_set *bs,
|
|
unsigned *segs)
|
|
{
|
|
struct bio_vec bv, bvprv, *bvprvp = NULL;
|
|
struct bvec_iter iter;
|
|
unsigned seg_size = 0, nsegs = 0, sectors = 0;
|
|
unsigned front_seg_size = bio->bi_seg_front_size;
|
|
bool do_split = true;
|
|
struct bio *new = NULL;
|
|
const unsigned max_sectors = get_max_io_size(q, bio);
|
|
unsigned bvecs = 0;
|
|
|
|
bio_for_each_segment(bv, bio, iter) {
|
|
/*
|
|
* With arbitrary bio size, the incoming bio may be very
|
|
* big. We have to split the bio into small bios so that
|
|
* each holds at most BIO_MAX_PAGES bvecs because
|
|
* bio_clone() can fail to allocate big bvecs.
|
|
*
|
|
* It should have been better to apply the limit per
|
|
* request queue in which bio_clone() is involved,
|
|
* instead of globally. The biggest blocker is the
|
|
* bio_clone() in bio bounce.
|
|
*
|
|
* If bio is splitted by this reason, we should have
|
|
* allowed to continue bios merging, but don't do
|
|
* that now for making the change simple.
|
|
*
|
|
* TODO: deal with bio bounce's bio_clone() gracefully
|
|
* and convert the global limit into per-queue limit.
|
|
*/
|
|
if (bvecs++ >= BIO_MAX_PAGES)
|
|
goto split;
|
|
|
|
/*
|
|
* If the queue doesn't support SG gaps and adding this
|
|
* offset would create a gap, disallow it.
|
|
*/
|
|
if (bvprvp && bvec_gap_to_prev(q, bvprvp, bv.bv_offset))
|
|
goto split;
|
|
|
|
if (sectors + (bv.bv_len >> 9) > max_sectors) {
|
|
/*
|
|
* Consider this a new segment if we're splitting in
|
|
* the middle of this vector.
|
|
*/
|
|
if (nsegs < queue_max_segments(q) &&
|
|
sectors < max_sectors) {
|
|
nsegs++;
|
|
sectors = max_sectors;
|
|
}
|
|
if (sectors)
|
|
goto split;
|
|
/* Make this single bvec as the 1st segment */
|
|
}
|
|
|
|
if (bvprvp && blk_queue_cluster(q)) {
|
|
if (seg_size + bv.bv_len > queue_max_segment_size(q))
|
|
goto new_segment;
|
|
if (!BIOVEC_PHYS_MERGEABLE(bvprvp, &bv))
|
|
goto new_segment;
|
|
if (!BIOVEC_SEG_BOUNDARY(q, bvprvp, &bv))
|
|
goto new_segment;
|
|
|
|
seg_size += bv.bv_len;
|
|
bvprv = bv;
|
|
bvprvp = &bvprv;
|
|
sectors += bv.bv_len >> 9;
|
|
|
|
if (nsegs == 1 && seg_size > front_seg_size)
|
|
front_seg_size = seg_size;
|
|
continue;
|
|
}
|
|
new_segment:
|
|
if (nsegs == queue_max_segments(q))
|
|
goto split;
|
|
|
|
nsegs++;
|
|
bvprv = bv;
|
|
bvprvp = &bvprv;
|
|
seg_size = bv.bv_len;
|
|
sectors += bv.bv_len >> 9;
|
|
|
|
if (nsegs == 1 && seg_size > front_seg_size)
|
|
front_seg_size = seg_size;
|
|
}
|
|
|
|
do_split = false;
|
|
split:
|
|
*segs = nsegs;
|
|
|
|
if (do_split) {
|
|
new = bio_split(bio, sectors, GFP_NOIO, bs);
|
|
if (new)
|
|
bio = new;
|
|
}
|
|
|
|
bio->bi_seg_front_size = front_seg_size;
|
|
if (seg_size > bio->bi_seg_back_size)
|
|
bio->bi_seg_back_size = seg_size;
|
|
|
|
return do_split ? new : NULL;
|
|
}
|
|
|
|
void blk_queue_split(struct request_queue *q, struct bio **bio,
|
|
struct bio_set *bs)
|
|
{
|
|
struct bio *split, *res;
|
|
unsigned nsegs;
|
|
|
|
switch (bio_op(*bio)) {
|
|
case REQ_OP_DISCARD:
|
|
case REQ_OP_SECURE_ERASE:
|
|
split = blk_bio_discard_split(q, *bio, bs, &nsegs);
|
|
break;
|
|
case REQ_OP_WRITE_SAME:
|
|
split = blk_bio_write_same_split(q, *bio, bs, &nsegs);
|
|
break;
|
|
default:
|
|
split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs);
|
|
break;
|
|
}
|
|
|
|
/* physical segments can be figured out during splitting */
|
|
res = split ? split : *bio;
|
|
res->bi_phys_segments = nsegs;
|
|
bio_set_flag(res, BIO_SEG_VALID);
|
|
|
|
if (split) {
|
|
/* there isn't chance to merge the splitted bio */
|
|
split->bi_opf |= REQ_NOMERGE;
|
|
|
|
bio_chain(split, *bio);
|
|
trace_block_split(q, split, (*bio)->bi_iter.bi_sector);
|
|
generic_make_request(*bio);
|
|
*bio = split;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(blk_queue_split);
|
|
|
|
static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
|
|
struct bio *bio,
|
|
bool no_sg_merge)
|
|
{
|
|
struct bio_vec bv, bvprv = { NULL };
|
|
int cluster, prev = 0;
|
|
unsigned int seg_size, nr_phys_segs;
|
|
struct bio *fbio, *bbio;
|
|
struct bvec_iter iter;
|
|
|
|
if (!bio)
|
|
return 0;
|
|
|
|
/*
|
|
* This should probably be returning 0, but blk_add_request_payload()
|
|
* (Christoph!!!!)
|
|
*/
|
|
if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)
|
|
return 1;
|
|
|
|
if (bio_op(bio) == REQ_OP_WRITE_SAME)
|
|
return 1;
|
|
|
|
fbio = bio;
|
|
cluster = blk_queue_cluster(q);
|
|
seg_size = 0;
|
|
nr_phys_segs = 0;
|
|
for_each_bio(bio) {
|
|
bio_for_each_segment(bv, bio, iter) {
|
|
/*
|
|
* If SG merging is disabled, each bio vector is
|
|
* a segment
|
|
*/
|
|
if (no_sg_merge)
|
|
goto new_segment;
|
|
|
|
if (prev && cluster) {
|
|
if (seg_size + bv.bv_len
|
|
> queue_max_segment_size(q))
|
|
goto new_segment;
|
|
if (!BIOVEC_PHYS_MERGEABLE(&bvprv, &bv))
|
|
goto new_segment;
|
|
if (!BIOVEC_SEG_BOUNDARY(q, &bvprv, &bv))
|
|
goto new_segment;
|
|
|
|
seg_size += bv.bv_len;
|
|
bvprv = bv;
|
|
continue;
|
|
}
|
|
new_segment:
|
|
if (nr_phys_segs == 1 && seg_size >
|
|
fbio->bi_seg_front_size)
|
|
fbio->bi_seg_front_size = seg_size;
|
|
|
|
nr_phys_segs++;
|
|
bvprv = bv;
|
|
prev = 1;
|
|
seg_size = bv.bv_len;
|
|
}
|
|
bbio = bio;
|
|
}
|
|
|
|
if (nr_phys_segs == 1 && seg_size > fbio->bi_seg_front_size)
|
|
fbio->bi_seg_front_size = seg_size;
|
|
if (seg_size > bbio->bi_seg_back_size)
|
|
bbio->bi_seg_back_size = seg_size;
|
|
|
|
return nr_phys_segs;
|
|
}
|
|
|
|
void blk_recalc_rq_segments(struct request *rq)
|
|
{
|
|
bool no_sg_merge = !!test_bit(QUEUE_FLAG_NO_SG_MERGE,
|
|
&rq->q->queue_flags);
|
|
|
|
rq->nr_phys_segments = __blk_recalc_rq_segments(rq->q, rq->bio,
|
|
no_sg_merge);
|
|
}
|
|
|
|
void blk_recount_segments(struct request_queue *q, struct bio *bio)
|
|
{
|
|
unsigned short seg_cnt = bio_segments(bio);
|
|
|
|
if (test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags) &&
|
|
(seg_cnt < queue_max_segments(q)))
|
|
bio->bi_phys_segments = seg_cnt;
|
|
else {
|
|
struct bio *nxt = bio->bi_next;
|
|
|
|
bio->bi_next = NULL;
|
|
bio->bi_phys_segments = __blk_recalc_rq_segments(q, bio, false);
|
|
bio->bi_next = nxt;
|
|
}
|
|
|
|
bio_set_flag(bio, BIO_SEG_VALID);
|
|
}
|
|
EXPORT_SYMBOL(blk_recount_segments);
|
|
|
|
static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
|
|
struct bio *nxt)
|
|
{
|
|
struct bio_vec end_bv = { NULL }, nxt_bv;
|
|
|
|
if (!blk_queue_cluster(q))
|
|
return 0;
|
|
|
|
if (bio->bi_seg_back_size + nxt->bi_seg_front_size >
|
|
queue_max_segment_size(q))
|
|
return 0;
|
|
|
|
if (!bio_has_data(bio))
|
|
return 1;
|
|
|
|
bio_get_last_bvec(bio, &end_bv);
|
|
bio_get_first_bvec(nxt, &nxt_bv);
|
|
|
|
if (!BIOVEC_PHYS_MERGEABLE(&end_bv, &nxt_bv))
|
|
return 0;
|
|
|
|
/*
|
|
* bio and nxt are contiguous in memory; check if the queue allows
|
|
* these two to be merged into one
|
|
*/
|
|
if (BIOVEC_SEG_BOUNDARY(q, &end_bv, &nxt_bv))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline void
|
|
__blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec,
|
|
struct scatterlist *sglist, struct bio_vec *bvprv,
|
|
struct scatterlist **sg, int *nsegs, int *cluster)
|
|
{
|
|
|
|
int nbytes = bvec->bv_len;
|
|
|
|
if (*sg && *cluster) {
|
|
if ((*sg)->length + nbytes > queue_max_segment_size(q))
|
|
goto new_segment;
|
|
|
|
if (!BIOVEC_PHYS_MERGEABLE(bvprv, bvec))
|
|
goto new_segment;
|
|
if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bvec))
|
|
goto new_segment;
|
|
|
|
(*sg)->length += nbytes;
|
|
} else {
|
|
new_segment:
|
|
if (!*sg)
|
|
*sg = sglist;
|
|
else {
|
|
/*
|
|
* If the driver previously mapped a shorter
|
|
* list, we could see a termination bit
|
|
* prematurely unless it fully inits the sg
|
|
* table on each mapping. We KNOW that there
|
|
* must be more entries here or the driver
|
|
* would be buggy, so force clear the
|
|
* termination bit to avoid doing a full
|
|
* sg_init_table() in drivers for each command.
|
|
*/
|
|
sg_unmark_end(*sg);
|
|
*sg = sg_next(*sg);
|
|
}
|
|
|
|
sg_set_page(*sg, bvec->bv_page, nbytes, bvec->bv_offset);
|
|
(*nsegs)++;
|
|
}
|
|
*bvprv = *bvec;
|
|
}
|
|
|
|
static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,
|
|
struct scatterlist *sglist,
|
|
struct scatterlist **sg)
|
|
{
|
|
struct bio_vec bvec, bvprv = { NULL };
|
|
struct bvec_iter iter;
|
|
int nsegs, cluster;
|
|
|
|
nsegs = 0;
|
|
cluster = blk_queue_cluster(q);
|
|
|
|
switch (bio_op(bio)) {
|
|
case REQ_OP_DISCARD:
|
|
case REQ_OP_SECURE_ERASE:
|
|
/*
|
|
* This is a hack - drivers should be neither modifying the
|
|
* biovec, nor relying on bi_vcnt - but because of
|
|
* blk_add_request_payload(), a discard bio may or may not have
|
|
* a payload we need to set up here (thank you Christoph) and
|
|
* bi_vcnt is really the only way of telling if we need to.
|
|
*/
|
|
if (!bio->bi_vcnt)
|
|
return 0;
|
|
/* Fall through */
|
|
case REQ_OP_WRITE_SAME:
|
|
*sg = sglist;
|
|
bvec = bio_iovec(bio);
|
|
sg_set_page(*sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset);
|
|
return 1;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
for_each_bio(bio)
|
|
bio_for_each_segment(bvec, bio, iter)
|
|
__blk_segment_map_sg(q, &bvec, sglist, &bvprv, sg,
|
|
&nsegs, &cluster);
|
|
|
|
return nsegs;
|
|
}
|
|
|
|
/*
|
|
* map a request to scatterlist, return number of sg entries setup. Caller
|
|
* must make sure sg can hold rq->nr_phys_segments entries
|
|
*/
|
|
int blk_rq_map_sg(struct request_queue *q, struct request *rq,
|
|
struct scatterlist *sglist)
|
|
{
|
|
struct scatterlist *sg = NULL;
|
|
int nsegs = 0;
|
|
|
|
if (rq->bio)
|
|
nsegs = __blk_bios_map_sg(q, rq->bio, sglist, &sg);
|
|
|
|
if (unlikely(rq->cmd_flags & REQ_COPY_USER) &&
|
|
(blk_rq_bytes(rq) & q->dma_pad_mask)) {
|
|
unsigned int pad_len =
|
|
(q->dma_pad_mask & ~blk_rq_bytes(rq)) + 1;
|
|
|
|
sg->length += pad_len;
|
|
rq->extra_len += pad_len;
|
|
}
|
|
|
|
if (q->dma_drain_size && q->dma_drain_needed(rq)) {
|
|
if (op_is_write(req_op(rq)))
|
|
memset(q->dma_drain_buffer, 0, q->dma_drain_size);
|
|
|
|
sg_unmark_end(sg);
|
|
sg = sg_next(sg);
|
|
sg_set_page(sg, virt_to_page(q->dma_drain_buffer),
|
|
q->dma_drain_size,
|
|
((unsigned long)q->dma_drain_buffer) &
|
|
(PAGE_SIZE - 1));
|
|
nsegs++;
|
|
rq->extra_len += q->dma_drain_size;
|
|
}
|
|
|
|
if (sg)
|
|
sg_mark_end(sg);
|
|
|
|
/*
|
|
* Something must have been wrong if the figured number of
|
|
* segment is bigger than number of req's physical segments
|
|
*/
|
|
WARN_ON(nsegs > rq->nr_phys_segments);
|
|
|
|
return nsegs;
|
|
}
|
|
EXPORT_SYMBOL(blk_rq_map_sg);
|
|
|
|
static inline int ll_new_hw_segment(struct request_queue *q,
|
|
struct request *req,
|
|
struct bio *bio)
|
|
{
|
|
int nr_phys_segs = bio_phys_segments(q, bio);
|
|
|
|
if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q))
|
|
goto no_merge;
|
|
|
|
if (blk_integrity_merge_bio(q, req, bio) == false)
|
|
goto no_merge;
|
|
|
|
/*
|
|
* This will form the start of a new hw segment. Bump both
|
|
* counters.
|
|
*/
|
|
req->nr_phys_segments += nr_phys_segs;
|
|
return 1;
|
|
|
|
no_merge:
|
|
req->cmd_flags |= REQ_NOMERGE;
|
|
if (req == q->last_merge)
|
|
q->last_merge = NULL;
|
|
return 0;
|
|
}
|
|
|
|
int ll_back_merge_fn(struct request_queue *q, struct request *req,
|
|
struct bio *bio)
|
|
{
|
|
if (req_gap_back_merge(req, bio))
|
|
return 0;
|
|
if (blk_integrity_rq(req) &&
|
|
integrity_req_gap_back_merge(req, bio))
|
|
return 0;
|
|
if (blk_rq_sectors(req) + bio_sectors(bio) >
|
|
blk_rq_get_max_sectors(req, blk_rq_pos(req))) {
|
|
req->cmd_flags |= REQ_NOMERGE;
|
|
if (req == q->last_merge)
|
|
q->last_merge = NULL;
|
|
return 0;
|
|
}
|
|
if (!bio_flagged(req->biotail, BIO_SEG_VALID))
|
|
blk_recount_segments(q, req->biotail);
|
|
if (!bio_flagged(bio, BIO_SEG_VALID))
|
|
blk_recount_segments(q, bio);
|
|
|
|
return ll_new_hw_segment(q, req, bio);
|
|
}
|
|
|
|
int ll_front_merge_fn(struct request_queue *q, struct request *req,
|
|
struct bio *bio)
|
|
{
|
|
|
|
if (req_gap_front_merge(req, bio))
|
|
return 0;
|
|
if (blk_integrity_rq(req) &&
|
|
integrity_req_gap_front_merge(req, bio))
|
|
return 0;
|
|
if (blk_rq_sectors(req) + bio_sectors(bio) >
|
|
blk_rq_get_max_sectors(req, bio->bi_iter.bi_sector)) {
|
|
req->cmd_flags |= REQ_NOMERGE;
|
|
if (req == q->last_merge)
|
|
q->last_merge = NULL;
|
|
return 0;
|
|
}
|
|
if (!bio_flagged(bio, BIO_SEG_VALID))
|
|
blk_recount_segments(q, bio);
|
|
if (!bio_flagged(req->bio, BIO_SEG_VALID))
|
|
blk_recount_segments(q, req->bio);
|
|
|
|
return ll_new_hw_segment(q, req, bio);
|
|
}
|
|
|
|
/*
|
|
* blk-mq uses req->special to carry normal driver per-request payload, it
|
|
* does not indicate a prepared command that we cannot merge with.
|
|
*/
|
|
static bool req_no_special_merge(struct request *req)
|
|
{
|
|
struct request_queue *q = req->q;
|
|
|
|
return !q->mq_ops && req->special;
|
|
}
|
|
|
|
static int ll_merge_requests_fn(struct request_queue *q, struct request *req,
|
|
struct request *next)
|
|
{
|
|
int total_phys_segments;
|
|
unsigned int seg_size =
|
|
req->biotail->bi_seg_back_size + next->bio->bi_seg_front_size;
|
|
|
|
/*
|
|
* First check if the either of the requests are re-queued
|
|
* requests. Can't merge them if they are.
|
|
*/
|
|
if (req_no_special_merge(req) || req_no_special_merge(next))
|
|
return 0;
|
|
|
|
if (req_gap_back_merge(req, next->bio))
|
|
return 0;
|
|
|
|
/*
|
|
* Will it become too large?
|
|
*/
|
|
if ((blk_rq_sectors(req) + blk_rq_sectors(next)) >
|
|
blk_rq_get_max_sectors(req, blk_rq_pos(req)))
|
|
return 0;
|
|
|
|
total_phys_segments = req->nr_phys_segments + next->nr_phys_segments;
|
|
if (blk_phys_contig_segment(q, req->biotail, next->bio)) {
|
|
if (req->nr_phys_segments == 1)
|
|
req->bio->bi_seg_front_size = seg_size;
|
|
if (next->nr_phys_segments == 1)
|
|
next->biotail->bi_seg_back_size = seg_size;
|
|
total_phys_segments--;
|
|
}
|
|
|
|
if (total_phys_segments > queue_max_segments(q))
|
|
return 0;
|
|
|
|
if (blk_integrity_merge_rq(q, req, next) == false)
|
|
return 0;
|
|
|
|
/* Merge is OK... */
|
|
req->nr_phys_segments = total_phys_segments;
|
|
return 1;
|
|
}
|
|
|
|
/**
|
|
* blk_rq_set_mixed_merge - mark a request as mixed merge
|
|
* @rq: request to mark as mixed merge
|
|
*
|
|
* Description:
|
|
* @rq is about to be mixed merged. Make sure the attributes
|
|
* which can be mixed are set in each bio and mark @rq as mixed
|
|
* merged.
|
|
*/
|
|
void blk_rq_set_mixed_merge(struct request *rq)
|
|
{
|
|
unsigned int ff = rq->cmd_flags & REQ_FAILFAST_MASK;
|
|
struct bio *bio;
|
|
|
|
if (rq->cmd_flags & REQ_MIXED_MERGE)
|
|
return;
|
|
|
|
/*
|
|
* @rq will no longer represent mixable attributes for all the
|
|
* contained bios. It will just track those of the first one.
|
|
* Distributes the attributs to each bio.
|
|
*/
|
|
for (bio = rq->bio; bio; bio = bio->bi_next) {
|
|
WARN_ON_ONCE((bio->bi_opf & REQ_FAILFAST_MASK) &&
|
|
(bio->bi_opf & REQ_FAILFAST_MASK) != ff);
|
|
bio->bi_opf |= ff;
|
|
}
|
|
rq->cmd_flags |= REQ_MIXED_MERGE;
|
|
}
|
|
|
|
static void blk_account_io_merge(struct request *req)
|
|
{
|
|
if (blk_do_io_stat(req)) {
|
|
struct hd_struct *part;
|
|
int cpu;
|
|
|
|
cpu = part_stat_lock();
|
|
part = req->part;
|
|
|
|
part_round_stats(cpu, part);
|
|
part_dec_in_flight(part, rq_data_dir(req));
|
|
|
|
hd_struct_put(part);
|
|
part_stat_unlock();
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Has to be called with the request spinlock acquired
|
|
*/
|
|
static int attempt_merge(struct request_queue *q, struct request *req,
|
|
struct request *next)
|
|
{
|
|
if (!rq_mergeable(req) || !rq_mergeable(next))
|
|
return 0;
|
|
|
|
if (req_op(req) != req_op(next))
|
|
return 0;
|
|
|
|
/*
|
|
* not contiguous
|
|
*/
|
|
if (blk_rq_pos(req) + blk_rq_sectors(req) != blk_rq_pos(next))
|
|
return 0;
|
|
|
|
if (rq_data_dir(req) != rq_data_dir(next)
|
|
|| req->rq_disk != next->rq_disk
|
|
|| req_no_special_merge(next))
|
|
return 0;
|
|
|
|
if (req_op(req) == REQ_OP_WRITE_SAME &&
|
|
!blk_write_same_mergeable(req->bio, next->bio))
|
|
return 0;
|
|
|
|
/*
|
|
* If we are allowed to merge, then append bio list
|
|
* from next to rq and release next. merge_requests_fn
|
|
* will have updated segment counts, update sector
|
|
* counts here.
|
|
*/
|
|
if (!ll_merge_requests_fn(q, req, next))
|
|
return 0;
|
|
|
|
/*
|
|
* If failfast settings disagree or any of the two is already
|
|
* a mixed merge, mark both as mixed before proceeding. This
|
|
* makes sure that all involved bios have mixable attributes
|
|
* set properly.
|
|
*/
|
|
if ((req->cmd_flags | next->cmd_flags) & REQ_MIXED_MERGE ||
|
|
(req->cmd_flags & REQ_FAILFAST_MASK) !=
|
|
(next->cmd_flags & REQ_FAILFAST_MASK)) {
|
|
blk_rq_set_mixed_merge(req);
|
|
blk_rq_set_mixed_merge(next);
|
|
}
|
|
|
|
/*
|
|
* At this point we have either done a back merge
|
|
* or front merge. We need the smaller start_time of
|
|
* the merged requests to be the current request
|
|
* for accounting purposes.
|
|
*/
|
|
if (time_after(req->start_time, next->start_time))
|
|
req->start_time = next->start_time;
|
|
|
|
req->biotail->bi_next = next->bio;
|
|
req->biotail = next->biotail;
|
|
|
|
req->__data_len += blk_rq_bytes(next);
|
|
|
|
elv_merge_requests(q, req, next);
|
|
|
|
/*
|
|
* 'next' is going away, so update stats accordingly
|
|
*/
|
|
blk_account_io_merge(next);
|
|
|
|
req->ioprio = ioprio_best(req->ioprio, next->ioprio);
|
|
if (blk_rq_cpu_valid(next))
|
|
req->cpu = next->cpu;
|
|
|
|
/* owner-ship of bio passed from next to req */
|
|
next->bio = NULL;
|
|
__blk_put_request(q, next);
|
|
return 1;
|
|
}
|
|
|
|
int attempt_back_merge(struct request_queue *q, struct request *rq)
|
|
{
|
|
struct request *next = elv_latter_request(q, rq);
|
|
|
|
if (next)
|
|
return attempt_merge(q, rq, next);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int attempt_front_merge(struct request_queue *q, struct request *rq)
|
|
{
|
|
struct request *prev = elv_former_request(q, rq);
|
|
|
|
if (prev)
|
|
return attempt_merge(q, prev, rq);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
|
|
struct request *next)
|
|
{
|
|
struct elevator_queue *e = q->elevator;
|
|
|
|
if (e->type->ops.elevator_allow_rq_merge_fn)
|
|
if (!e->type->ops.elevator_allow_rq_merge_fn(q, rq, next))
|
|
return 0;
|
|
|
|
return attempt_merge(q, rq, next);
|
|
}
|
|
|
|
bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
|
|
{
|
|
if (!rq_mergeable(rq) || !bio_mergeable(bio))
|
|
return false;
|
|
|
|
if (req_op(rq) != bio_op(bio))
|
|
return false;
|
|
|
|
/* different data direction or already started, don't merge */
|
|
if (bio_data_dir(bio) != rq_data_dir(rq))
|
|
return false;
|
|
|
|
/* must be same device and not a special request */
|
|
if (rq->rq_disk != bio->bi_bdev->bd_disk || req_no_special_merge(rq))
|
|
return false;
|
|
|
|
/* only merge integrity protected bio into ditto rq */
|
|
if (blk_integrity_merge_bio(rq->q, rq, bio) == false)
|
|
return false;
|
|
|
|
/* must be using the same buffer */
|
|
if (req_op(rq) == REQ_OP_WRITE_SAME &&
|
|
!blk_write_same_mergeable(rq->bio, bio))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
int blk_try_merge(struct request *rq, struct bio *bio)
|
|
{
|
|
if (blk_rq_pos(rq) + blk_rq_sectors(rq) == bio->bi_iter.bi_sector)
|
|
return ELEVATOR_BACK_MERGE;
|
|
else if (blk_rq_pos(rq) - bio_sectors(bio) == bio->bi_iter.bi_sector)
|
|
return ELEVATOR_FRONT_MERGE;
|
|
return ELEVATOR_NO_MERGE;
|
|
}
|