)]}' { "log": [ { "commit": "3c9c708c9fc967e389f85bc735e4c1f65d67334e", "tree": "946eeefd4599bb1adafd87ad8f46d52382935001", "parents": [ "b77874c9699522540e65aa4291e37a7e43533bf3" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 31 13:39:05 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu May 31 13:39:05 2012 +0200" }, "message": "block: avoid infinite loop in get_task_io_context()\n\nCalling get_task_io_context() on a exiting task which isn\u0027t %current can\nloop forever. This triggers at boot time on my dev machine.\n\nBUG: soft lockup - CPU#3 stuck for 22s ! [mountall.1603]\n\nFix this by making create_task_io_context() returns -EBUSY in this case\nto break the loop.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0d167518e045cc8bb63f0a8a0a85ad4fa4e0044f", "tree": "101a9b5d425d79f663e4f25f1e90b7a8cc6604f1", "parents": [ "2f83766d4b18774c856329a8fca4c9338dfeda39", "ff26eaadf4d914e397872b99885d45756104e9ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "message": "Merge branch \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block\n\nMerge block/IO core bits from Jens Axboe:\n \"This is a bit bigger on the core side than usual, but that is purely\n because we decided to hold off on parts of Tejun\u0027s submission on 3.4\n to give it a bit more time to simmer. As a consequence, it\u0027s seen a\n long cycle in for-next.\n\n It contains:\n\n - Bug fix from Dan, wrong locking type.\n - Relax splice gifting restriction from Eric.\n - A ton of updates from Tejun, primarily for blkcg. This improves\n the code a lot, making the API nicer and cleaner, and also includes\n fixes for how we handle and tie policies and re-activate on\n switches. The changes also include generic bug fixes.\n - A simple fix from Vivek, along with a fix for doing proper delayed\n allocation of the blkcg stats.\"\n\nFix up annoying conflict just due to different merge resolution in\nDocumentation/feature-removal-schedule.txt\n\n* \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block: (92 commits)\n blkcg: tg_stats_alloc_lock is an irq lock\n vmsplice: relax alignement requirements for SPLICE_F_GIFT\n blkcg: use radix tree to index blkgs from blkcg\n blkcg: fix blkcg-\u003ecss ref leak in __blkg_lookup_create()\n block: fix elvpriv allocation failure handling\n block: collapse blk_alloc_request() into get_request()\n blkcg: collapse blkcg_policy_ops into blkcg_policy\n blkcg: embed struct blkg_policy_data in policy specific data\n blkcg: mass rename of blkcg API\n blkcg: style cleanups for blk-cgroup.h\n blkcg: remove blkio_group-\u003epath[]\n blkcg: blkg_rwstat_read() was missing inline\n blkcg: shoot down blkgs if all policies are deactivated\n blkcg: drop stuff unused after per-queue policy activation update\n blkcg: implement per-queue policy activation\n blkcg: add request_queue-\u003eroot_blkg\n blkcg: make request_queue bypassing on allocation\n blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing\n blkcg: make blkg_conf_prep() take @pol and return with queue lock held\n blkcg: remove static policy ID enums\n ...\n" }, { "commit": "ff26eaadf4d914e397872b99885d45756104e9ae", "tree": "5020f3e4a14ab68f6d027366e719b7fb5193123c", "parents": [ "0b7877d4eea3f93e3dd941999522bbd8c538cb53" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed May 23 12:16:21 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed May 23 12:16:21 2012 +0200" }, "message": "blkcg: tg_stats_alloc_lock is an irq lock\n\ntg_stats_alloc_lock nests inside queue lock and should always be held\nwith irq disabled. throtl_pd_{init|exit}() were using non-irqsafe\nspinlock ops which triggered inverse lock ordering via irq warning via\nRCU freeing of blkg invoking throtl_pd_exit() w/o disabling IRQ.\n\nUpdate both functions to use irq safe operations.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Sasha Levin \u003csasha.levin@oracle.com\u003e\nLKML-Reference: \u003c1335339396.16988.80.camel@lappy\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "tree": "8f17415c0722b0a4d7511ac170cfb4e3802e1ad2", "parents": [ "f5c101892fbd3d2f6d2729bc7eb7b3f6c31dbddd", "0d4dde1ac9a5af74ac76c6ab90557d1ae7b8f5d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 17:40:19 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n \"cgroup file type addition / removal is updated so that file types are\n added and removed instead of individual files so that dynamic file\n type addition / removal can be implemented by cgroup and used by\n controllers. blkio controller changes which will come through block\n tree are dependent on this. Other changes include res_counter cleanup\n and disallowing kthread / PF_THREAD_BOUND threads to be attached to\n non-root cgroups.\n\n There\u0027s a reported bug with the file type addition / removal handling\n which can lead to oops on cgroup umount. The issue is being looked\n into. It shouldn\u0027t cause problems for most setups and isn\u0027t a\n security concern.\"\n\nFix up trivial conflict in Documentation/feature-removal-schedule.txt\n\n* \u0027for-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n res_counter: Account max_usage when calling res_counter_charge_nofail()\n res_counter: Merge res_counter_charge and res_counter_charge_nofail\n cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads\n cgroup: remove cgroup_subsys-\u003epopulate()\n cgroup: get rid of populate for memcg\n cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg\n cgroup: make css-\u003erefcnt clearing on cgroup removal optional\n cgroup: use negative bias on css-\u003erefcnt to block css_tryget()\n cgroup: implement cgroup_rm_cftypes()\n cgroup: introduce struct cfent\n cgroup: relocate __d_cgrp() and __d_cft()\n cgroup: remove cgroup_add_file[s]()\n cgroup: convert memcg controller to the new cftype interface\n memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP\n cgroup: convert all non-memcg controllers to the new cftype interface\n cgroup: relocate cftype and cgroup_subsys definitions in controllers\n cgroup: merge cft_release_agent cftype array into the base files array\n cgroup: implement cgroup_add_cftypes() and friends\n cgroup: build list of all cgroups under a given cgroupfs_root\n cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()\n ...\n" }, { "commit": "e60b9a0346ee08af4715ee5b2d82f705fbe6e309", "tree": "886e1be2a283806e1dc940b7379a5a6e4683a97b", "parents": [ "9daeaa370526df1c19eba4780247bb7155541e38", "a7475afd530e6bf81c9025b0134dd1c7c6f1a219" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:41:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:41:17 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 updates from Martin Schwidefsky:\n \"Just a random collection of bug-fixes and cleanups, nothing new in\n this merge request.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (46 commits)\n s390/ap: Fix wrong or missing comments\n s390/ap: move receive callback to message struct\n s390/dasd: re-prioritize partition detection message\n s390/qeth: reshuffle initialization\n s390/qeth: cleanup drv attr usage\n s390/claw: cleanup drv attr usage\n s390/lcs: cleanup drv attr usage\n s390/ctc: cleanup drv attr usage\n s390/ccwgroup: remove ccwgroup_create_from_string\n s390/qeth: stop using struct ccwgroup driver for discipline callbacks\n s390/qeth: switch to ccwgroup_create_dev\n s390/claw: switch to ccwgroup_create_dev\n s390/lcs: switch to ccwgroup_create_dev\n s390/ctcm: switch to ccwgroup_create_dev\n s390/ccwgroup: exploit ccwdev_by_dev_id\n s390/ccwgroup: introduce ccwgroup_create_dev\n s390: fix race on TIF_MCCK_PENDING\n s390/barrier: make use of fast-bcr facility\n s390/barrier: cleanup barrier functions\n s390/claw: remove \"eieio\" calls\n ...\n" }, { "commit": "505e5ecfd3930bd1b429c36f10403d32a6c3c951", "tree": "3ce6ccd0a185bdb8857497ccf55d8b9c408b45a4", "parents": [ "afb6ac598f5c4433ab2aff5932ea2f69f74e75e7" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Wed May 16 12:30:52 2012 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Wed May 16 14:42:51 2012 +0200" }, "message": "s390/dasd: re-prioritize partition detection message\n\nTo avoid confusion while formatting a DASD device change the level of\nthe \"Expected VOL1 label not found\" message from warning to info.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "05c69d298c96703741cac9a5cbbf6c53bd55a6e2", "tree": "a9918d8c056adcd527b6cdf23ec9dc26e585efe9", "parents": [ "85fd0bc95bc76d129db0d0114c40665745bbba07" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue May 15 08:22:04 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue May 15 08:22:04 2012 +0200" }, "message": "block: fix buffer overflow when printing partition UUIDs\n\n6d1d8050b4bc8 \"block, partition: add partition_meta_info to hd_struct\"\nadded part_unpack_uuid() which assumes that the passed in buffer has\nenough space for sprintfing \"%pU\" - 37 characters including \u0027\\0\u0027.\n\nUnfortunately, b5af921ec0233 \"init: add support for root devices\nspecified by partition UUID\" supplied 33 bytes buffer to the function\nleading to the following panic with stackprotector enabled.\n\n Kernel panic - not syncing: stack-protector: Kernel stack corrupted in: ffffffff81b14c7e\n\n [\u003cffffffff815e226b\u003e] panic+0xba/0x1c6\n [\u003cffffffff81b14c7e\u003e] ? printk_all_partitions+0x259/0x26xb\n [\u003cffffffff810566bb\u003e] __stack_chk_fail+0x1b/0x20\n [\u003cffffffff81b15c7e\u003e] printk_all_paritions+0x259/0x26xb\n [\u003cffffffff81aedfe0\u003e] mount_block_root+0x1bc/0x27f\n [\u003cffffffff81aee0fa\u003e] mount_root+0x57/0x5b\n [\u003cffffffff81aee23b\u003e] prepare_namespace+0x13d/0x176\n [\u003cffffffff8107eec0\u003e] ? release_tgcred.isra.4+0x330/0x30\n [\u003cffffffff81aedd60\u003e] kernel_init+0x155/0x15a\n [\u003cffffffff81087b97\u003e] ? schedule_tail+0x27/0xb0\n [\u003cffffffff815f4d24\u003e] kernel_thread_helper+0x5/0x10\n [\u003cffffffff81aedc0b\u003e] ? start_kernel+0x3c5/0x3c5\n [\u003cffffffff815f4d20\u003e] ? gs_change+0x13/0x13\n\nIncrease the buffer size, remove the dangerous part_unpack_uuid() and\nuse snprintf() directly from printk_all_partitions().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Szymon Gruszczynski \u003csz.gruszczynski@googlemail.com\u003e\nCc: Will Drewry \u003cwad@chromium.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0b7877d4eea3f93e3dd941999522bbd8c538cb53", "tree": "ade6d4e411b9b9b569c802e3b2179826162c934c", "parents": [ "bd1a68b59c8e3bce45fb76632c64e1e063c3962d", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue May 01 14:29:55 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue May 01 14:29:55 2012 +0200" }, "message": "Merge tag \u0027v3.4-rc5\u0027 into for-3.5/core\n\nThe core branch is behind driver commits that we want to build\non for 3.5, hence I\u0027m pulling in a later -rc.\n\nLinux 3.4-rc5\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "a637120e49021d197e9578cba545bbaa459cbb51", "tree": "0d502a8fcc55c89eb4d79a7578e46a9273d1f2c8", "parents": [ "496fb7806d616185a46865a4f3a20ef19dc6c7e3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 19 16:29:24 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:40 2012 +0200" }, "message": "blkcg: use radix tree to index blkgs from blkcg\n\nblkg lookup is currently performed by traversing linked list anchored\nat blkcg-\u003eblkg_list. This is very unscalable and with blk-throttle\nenabled and enough request queues on the system, this can get very\nugly quickly (blk-throttle performs look up on every bio submission).\n\nThis patch makes blkcg use radix tree to index blkgs combined with\nsimple last-looked-up hint. This is mostly identical to how icqs are\nindexed from ioc.\n\nNote that because __blkg_lookup() may be invoked without holding queue\nlock, hint is only updated from __blkg_lookup_create(). Due to cfq\u0027s\ncfqq caching, this makes hint updates overly lazy. This will be\nimproved with scheduled blkcg aware request allocation.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "496fb7806d616185a46865a4f3a20ef19dc6c7e3", "tree": "a200e6825be55f6d0ed411ec32dc16244f488fd9", "parents": [ "aaf7c680682f1999ef2e574f743c45d1674a8b8a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 19 16:29:23 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:40 2012 +0200" }, "message": "blkcg: fix blkcg-\u003ecss ref leak in __blkg_lookup_create()\n\n__blkg_lookup_create() leaked blkcg-\u003ecss ref if blkg allocation\nfailed. Fix it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "aaf7c680682f1999ef2e574f743c45d1674a8b8a", "tree": "82d597ddfa7456553262435174948d9fb03fffef", "parents": [ "29e2b09ab5fa790514d47838f3c05497130908b3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 19 16:29:22 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:40 2012 +0200" }, "message": "block: fix elvpriv allocation failure handling\n\nRequest allocation is mempool backed to guarantee forward progress\nunder memory pressure; unfortunately, this property got broken while\nadding elvpriv data. Failures during elvpriv allocation, including\nioc and icq creation failures, currently make get_request() fail as\nwhole. There\u0027s no forward progress guarantee for these allocations -\nthey may fail indefinitely under memory pressure stalling IO and\ndeadlocking the system.\n\nThis patch updates get_request() such that elvpriv allocation failure\ndoesn\u0027t make the whole function fail. If elvpriv allocation fails,\nthe allocation is degraded into !ELVPRIV. This will force the request\nto ELEVATOR_INSERT_BACK disturbing scheduling but elvpriv alloc\nfailures should be rare (nothing is per-request) and anything is\nbetter than deadlocking.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "29e2b09ab5fa790514d47838f3c05497130908b3", "tree": "aa430587f78d90d3108c1885f8049da484631935", "parents": [ "f9fcc2d3919b8eb575b3cee9274feefafb641bca" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 19 16:29:21 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:40 2012 +0200" }, "message": "block: collapse blk_alloc_request() into get_request()\n\nAllocation failure handling in get_request() is about to be updated.\nTo ease the update, collapse blk_alloc_request() into get_request().\n\nThis patch doesn\u0027t introduce any functional change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f9fcc2d3919b8eb575b3cee9274feefafb641bca", "tree": "bb3eaeb993b21ba352c0967488a6955a40314d97", "parents": [ "f95a04afa80c0f4ddd645ef6a84ed118b5d1ad46" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:27 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:17 2012 +0200" }, "message": "blkcg: collapse blkcg_policy_ops into blkcg_policy\n\nThere\u0027s no reason to keep blkcg_policy_ops separate. Collapse it into\nblkcg_policy.\n\nThis patch doesn\u0027t introduce any functional change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f95a04afa80c0f4ddd645ef6a84ed118b5d1ad46", "tree": "2428dacf9bab1eb643628c872aed3092704f7fb2", "parents": [ "3c798398e393e5f9502dbab2b51e6c25e2e8f2ac" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:26 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:17 2012 +0200" }, "message": "blkcg: embed struct blkg_policy_data in policy specific data\n\nCurrently blkg_policy_data carries policy specific data as char flex\narray instead of being embedded in policy specific data. This was\nforced by oddities around blkg allocation which are all gone now.\n\nThis patch makes blkg_policy_data embedded in policy specific data -\nthrotl_grp and cfq_group so that it\u0027s more conventional and consistent\nwith how io_cq is handled.\n\n* blkcg_policy-\u003epdata_size is renamed to -\u003epd_size.\n\n* Functions which used to take void *pdata now takes struct\n blkg_policy_data *pd.\n\n* blkg_to_pdata/pdata_to_blkg() updated to blkg_to_pd/pd_to_blkg().\n\n* Dummy struct blkg_policy_data definition added. Dummy\n pdata_to_blkg() definition was unused and inconsistent with the\n non-dummy version - correct dummy pd_to_blkg() added.\n\n* throtl and cfq updated accordingly.\n\n* As dummy blkg_to_pd/pd_to_blkg() are provided,\n blkg_to_cfqg/cfqg_to_blkg() don\u0027t need to be ifdef\u0027d. Moved outside\n ifdef block.\n\nThis patch doesn\u0027t introduce any functional change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "3c798398e393e5f9502dbab2b51e6c25e2e8f2ac", "tree": "d6f638e6a25dec4887e64bcc35b98bc394cb974f", "parents": [ "36558c8a30e121f97b5852ae33e28081af21bdbf" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:25 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:17 2012 +0200" }, "message": "blkcg: mass rename of blkcg API\n\nDuring the recent blkcg cleanup, most of blkcg API has changed to such\nextent that mass renaming wouldn\u0027t cause any noticeable pain. Take\nthe chance and cleanup the naming.\n\n* Rename blkio_cgroup to blkcg.\n\n* Drop blkio / blkiocg prefixes and consistently use blkcg.\n\n* Rename blkio_group to blkcg_gq, which is consistent with io_cq but\n keep the blkg prefix / variable name.\n\n* Rename policy method type and field names to signify they\u0027re dealing\n with policy data.\n\n* Rename blkio_policy_type to blkcg_policy.\n\nThis patch doesn\u0027t cause any functional change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "36558c8a30e121f97b5852ae33e28081af21bdbf", "tree": "de9b361baf71b0b893d4053ac061f8e160ecfd37", "parents": [ "54e7ed12bad1e3aa2a28558fab6850240465f973" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:24 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:16 2012 +0200" }, "message": "blkcg: style cleanups for blk-cgroup.h\n\n* Update indentation on struct field declarations.\n\n* Uniformly don\u0027t use \"extern\" on function declarations.\n\n* Merge the two #ifdef CONFIG_BLK_CGROUP blocks.\n\nAll changes in this patch are cosmetic.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "54e7ed12bad1e3aa2a28558fab6850240465f973", "tree": "907eb0451782f4eb1ad3f9236e51ec4acb7fb941", "parents": [ "c94bed89995e638e43a6663177358b9d20617361" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:23 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:16 2012 +0200" }, "message": "blkcg: remove blkio_group-\u003epath[]\n\nblkio_group-\u003epath[] stores the path of the associated cgroup and is\nused only for debug messages. Just format the path from blkg-\u003ecgroup\nwhen printing debug messages.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "c94bed89995e638e43a6663177358b9d20617361", "tree": "901c1a4aa7cde07cb921889b94ea2cafd15e79b7", "parents": [ "6d18b008daf46bcd82b8ae250aae0785f9714096" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 16 13:57:22 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:16 2012 +0200" }, "message": "blkcg: blkg_rwstat_read() was missing inline\n\nblkg_rwstat_read() in blk-cgroup.h was missing inline modifier causing\ncompile warning depending on configuration. Add it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6d18b008daf46bcd82b8ae250aae0785f9714096", "tree": "e70e66ce74220d5a0c7382acd20efbd4835c8f77", "parents": [ "3c96cb32d318f323c1bf972a4c66821f8499e34d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:35 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: shoot down blkgs if all policies are deactivated\n\nThere\u0027s no reason to keep blkgs around if no policy is activated for\nthe queue. This patch moves queue locking out of blkg_destroy_all()\nand call it from blkg_deactivate_policy() on deactivation of the last\npolicy on the queue.\n\nThis change was suggested by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "3c96cb32d318f323c1bf972a4c66821f8499e34d", "tree": "e76d0437f487405d8a22a727b8085696b949179d", "parents": [ "a2b1693bac45ea3fe3ba612fd22c45f17449f610" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:34 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: drop stuff unused after per-queue policy activation update\n\n* All_q_list is unused. Drop all_q_{mutex|list}.\n\n* @for_root of blkg_lookup_create() is always %false when called from\n outside blk-cgroup.c proper. Factor out __blkg_lookup_create() so\n that it doesn\u0027t check whether @q is bypassing and use the\n underscored version for the @for_root callsite.\n\n* blkg_destroy_all() is used only from blkcg proper and @destroy_root\n is always %true. Make it static and drop @destroy_root.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "a2b1693bac45ea3fe3ba612fd22c45f17449f610", "tree": "2e05859caab6453efbc85d584dd72dca7ef03cd0", "parents": [ "03d8e11142a893ad322285d3c8a08e88b570cda1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:33 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: implement per-queue policy activation\n\nAll blkcg policies were assumed to be enabled on all request_queues.\nDue to various implementation obstacles, during the recent blkcg core\nupdates, this was temporarily implemented as shooting down all !root\nblkgs on elevator switch and policy [de]registration combined with\nhalf-broken in-place root blkg updates. In addition to being buggy\nand racy, this meant losing all blkcg configurations across those\nevents.\n\nNow that blkcg is cleaned up enough, this patch replaces the temporary\nimplementation with proper per-queue policy activation. Each blkcg\npolicy should call the new blkcg_[de]activate_policy() to enable and\ndisable the policy on a specific queue. blkcg_activate_policy()\nallocates and installs policy data for the policy for all existing\nblkgs. blkcg_deactivate_policy() does the reverse. If a policy is\nnot enabled for a given queue, blkg printing / config functions skip\nthe respective blkg for the queue.\n\nblkcg_activate_policy() also takes care of root blkg creation, and\ncfq_init_queue() and blk_throtl_init() are updated accordingly.\n\nThis replaces blkcg_bypass_{start|end}() and update_root_blkg_pd()\nunnecessary. Dropped.\n\nv2: cfq_init_queue() was returning uninitialized @ret on root_group\n alloc failure if !CONFIG_CFQ_GROUP_IOSCHED. Fixed.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "03d8e11142a893ad322285d3c8a08e88b570cda1", "tree": "0f6117ffdb0ad9565a165a98a8d4985ced094eb1", "parents": [ "b82d4b197c782ced82a8b7b76664125d2d3c156c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:32 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: add request_queue-\u003eroot_blkg\n\nWith per-queue policy activation, root blkg creation will be moved to\nblkcg core. Add q-\u003eroot_blkg in preparation. For blk-throtl, this\nreplaces throtl_data-\u003eroot_tg; however, cfq needs to keep\ncfqd-\u003eroot_group for !CONFIG_CFQ_GROUP_IOSCHED.\n\nThis is to prepare for per-queue policy activation and doesn\u0027t cause\nany functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "b82d4b197c782ced82a8b7b76664125d2d3c156c", "tree": "2dafdbbdd9ca909e6a633c2d92818995ed58f8dd", "parents": [ "80fd99792b0b9f162abdf3da12fb10eb9eb5f321" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:31 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: make request_queue bypassing on allocation\n\nWith the previous change to guarantee bypass visiblity for RCU read\nlock regions, entering bypass mode involves non-trivial overhead and\nfuture changes are scheduled to make use of bypass mode during init\npath. Combined it may end up adding noticeable delay during boot.\n\nThis patch makes request_queue start its life in bypass mode, which is\nended on queue init completion at the end of\nblk_init_allocated_queue(), and updates blk_queue_bypass_start() such\nthat draining and RCU synchronization are performed only when the\nqueue actually enters bypass mode.\n\nThis avoids unnecessarily switching in and out of bypass mode during\ninit avoiding the overhead and any nasty surprises which may step from\nleaving bypass mode on half-initialized queues.\n\nThe boot time overhead was pointed out by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "80fd99792b0b9f162abdf3da12fb10eb9eb5f321", "tree": "3273581c76d9bcad18f0668f6707be9323e650fb", "parents": [ "da8b066262e12d1d0a3b1e6d3486e500169bf730" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 14:50:53 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing\n\nCurrently, blkg_lookup() doesn\u0027t check @q bypass state. This patch\nupdates blk_queue_bypass_start() to do synchronize_rcu() before\nreturning and updates blkg_lookup() to check blk_queue_bypass() and\nreturn %NULL if bypassing. This ensures blkg_lookup() returns %NULL\nif @q is bypassing.\n\nThis is to guarantee that nobody is accessing policy data while @q is\nbypassing, which is necessary to allow replacing blkio_cgroup-\u003epd[] in\nplace on policy [de]activation.\n\nv2: Added more comments explaining bypass guarantees as suggested by\n Vivek.\n\nv3: Added more comments explaining why there\u0027s no synchronize_rcu() in\n blk_cleanup_queue() as suggested by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "da8b066262e12d1d0a3b1e6d3486e500169bf730", "tree": "048eee7101b526017bbd295366bf2e95dd65e5a7", "parents": [ "8bd435b30ecacb69bbb8b2d3e251f770b807c5b2" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:29 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: make blkg_conf_prep() take @pol and return with queue lock held\n\nAdd @pol to blkg_conf_prep() and let it return with queue lock held\n(to be released by blkg_conf_finish()). Note that @pol isn\u0027t used\nyet.\n\nThis is to prepare for per-queue policy activation and doesn\u0027t cause\nany visible difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "8bd435b30ecacb69bbb8b2d3e251f770b807c5b2", "tree": "a1a50e95517a54a578af3967fb4016a5a1a42a68", "parents": [ "ec399347d39fb2337ebace928cf4a2855bd0ec37" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:28 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: remove static policy ID enums\n\nRemove BLKIO_POLICY_* enums and let blkio_policy_register() allocate\n@pol-\u003eplid dynamically on registration. The maximum number of blkcg\npolicies which can be registered at the same time is defined by\nBLKCG_MAX_POLS constant added to include/linux/blkdev.h.\n\nNote that blkio_policy_register() now may fail. Policy init functions\nupdated accordingly and unnecessary ifdefs removed from cfq_init().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "ec399347d39fb2337ebace928cf4a2855bd0ec37", "tree": "d95efeb004e8da914f7d3c726cd059b422443694", "parents": [ "bc0d6501a844392ab6ad419d7ca5af4693b6afac" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:27 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: use @pol instead of @plid in update_root_blkg_pd() and blkcg_print_blkgs()\n\nThe two functions were taking \"enum blkio_policy_id plid\". Make them\ntake \"const struct blkio_policy_type *pol\" instead.\n\nThis is to prepare for per-queue policy activation and doesn\u0027t cause\nany functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "bc0d6501a844392ab6ad419d7ca5af4693b6afac", "tree": "08375aff242a2efd35d830c7636ab61a3ec6a109", "parents": [ "f48ec1d7885281a9c6cd7779d61f321d1b1fd741" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:26 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "blkcg: kill blkio_list and replace blkio_list_lock with a mutex\n\nWith blkio_policy[], blkio_list is redundant and hinders with\nper-queue policy activation. Remove it. Also, replace\nblkio_list_lock with a mutex blkcg_pol_mutex and let it protect the\nwhole [un]registration.\n\nThis is to prepare for per-queue policy activation and doesn\u0027t cause\nany functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f48ec1d7885281a9c6cd7779d61f321d1b1fd741", "tree": "87f94a60dae017dc68b76605f76b89031004a7f7", "parents": [ "5bc4afb1ec6aa562fac4d9aba34d957ee42f5813" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Apr 13 13:11:25 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 20 10:06:06 2012 +0200" }, "message": "cfq: fix build breakage \u0026 warnings\n\n* CFQ_WEIGHT_* defined inside CONFIG_BLK_CGROUP causes cfq-iosched.c\n compile failure when the config is disabled. Move it outside the\n ifdef block.\n\n* Dummy cfqg_stats_*() definitions were lacking inline modifiers\n causing unused functions warning if !CONFIG_CFQ_GROUP_IOSCHED. Add\n them.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "d8dd0b6d4836bce81cece60509ef3b157a420776", "tree": "7a28f327a15443d6c9d091f3d272abd107251ab7", "parents": [ "2d59dcfb54ade45cacc59a6e7bd96b8c19088c3d", "1b2e19f17ed327af6add02978efdf354e4f8e4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "message": "Merge branch \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block core bits from Jens Axboe:\n \"It\u0027s a nice and quiet round this time, since most of the tricky stuff\n has been pushed to 3.5 to give it more time to mature. After a few\n hectic block IO core changes for 3.3 and 3.2, I\u0027m quite happy with a\n slow round.\n\n Really minor stuff in here, the only real functional change is making\n the auto-unplug threshold a per-queue entity. The threshold is set so\n that it\u0027s low enough that we don\u0027t hold off IO for too long, but still\n big enough to get a nice benefit from the batched insert (and hence\n queue lock cost reduction). For raid configurations, this currently\n breaks down.\"\n\n* \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block:\n block: make auto block plug flush threshold per-disk based\n Documentation: Add sysfs ABI change for cfq\u0027s target latency.\n block: Make cfq_target_latency tunable through sysfs.\n block: use lockdep_assert_held for queue locking\n block: blk_alloc_queue_node(): use caller\u0027s GFP flags instead of GFP_KERNEL\n" }, { "commit": "1b2e19f17ed327af6add02978efdf354e4f8e4df", "tree": "ad0340b201405fb19eaa7c8e6af0ac395e3dc8bd", "parents": [ "407ac95e2271a310016ced97f407676e79c53c06" ], "author": { "name": "Shaohua Li", "email": "shli@fusionio.com", "time": "Fri Apr 06 11:37:47 2012 -0600" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Apr 06 11:37:47 2012 -0600" }, "message": "block: make auto block plug flush threshold per-disk based\n\nWe do auto block plug flush to reduce latency, the threshold is 16\nrequests. This works well if the task is accessing one or two drives.\nThe problem is if the task is accessing a raid 0 device and the raid\ndisk number is big, say 8 or 16, 16/8 \u003d 2 or 16/16\u003d1, we will have\nheavy lock contention.\n\nThis patch makes the threshold per-disk based. The latency should be\nstill ok accessing one or two drives. The setup with application\naccessing a lot of drives in the meantime uaually is big machine,\navoiding lock contention is more important, because any contention\nwill actually increase latency.\n\nSigned-off-by: Shaohua Li \u003cshli@fusionio.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "5bc4afb1ec6aa562fac4d9aba34d957ee42f5813", "tree": "dfef1de2dcb71beab3150ffecf6ae564d326ffba", "parents": [ "d366e7ec41882791c970dfb7c67b737be8c3a174" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:45 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:45 2012 -0700" }, "message": "blkcg: drop BLKCG_STAT_{PRIV|POL|OFF} macros\n\nNow that all stat handling code lives in policy implementations,\nthere\u0027s no need to encode policy ID in cft-\u003eprivate.\n\n* Export blkcg_prfill_[rw]stat() from blkcg, remove\n blkcg_print_[rw]stat(), and implement cfqg_print_[rw]stat() which\n use hard-code BLKIO_POLICY_PROP.\n\n* Use cft-\u003eprivate for offset of the target field directly and drop\n BLKCG_STAT_{PRIV|POL|OFF}().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "d366e7ec41882791c970dfb7c67b737be8c3a174", "tree": "78d3c73d90276b797e1553c004272af869a30075", "parents": [ "af133ceb261033eb43c03d161a991c3b772e8c56" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: pass around pd-\u003epdata instead of pd itself in prfill functions\n\nNow that all conf and stat fields are moved into policy specific\nblkio_policy_data-\u003epdata areas, there\u0027s no reason to use\nblkio_policy_data itself in prfill functions. Pass around @pd-\u003epdata\ninstead of @pd.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "af133ceb261033eb43c03d161a991c3b772e8c56", "tree": "fdc943f4f8c2c7e19af0d963d73647d3333aaa5c", "parents": [ "3381cb8d2ef1523dbaeec99161d766c25f1e52d6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: move blkio_group_conf-\u003eiops and -\u003ebps to blk-throttle\n\nblkio_cgroup_conf-\u003eiops and -\u003ebps are owned by blk-throttle and has no\nreason to be defined in blkcg core. Drop them and let conf setting\nfunctions directly manipulate throtl_grp-\u003ebps[] and -\u003eiops[].\n\nThis makes blkio_group_conf empty. Drop it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "3381cb8d2ef1523dbaeec99161d766c25f1e52d6", "tree": "b5592ee2a0f84e694282c947611971eb7735622d", "parents": [ "8a3d26151f24e2a2ffa550890144c3d54d2edb15" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: move blkio_group_conf-\u003eweight to cfq\n\nblkio_group_conf-\u003eweight is owned by cfq and has no reason to be\ndefined in blkcg core. Replace it with cfq_group-\u003edev_weight and let\nconf setting functions directly set it. If dev_weight is zero, the\ncfqg doesn\u0027t have device specific weight configured.\n\nAlso, rename BLKIO_WEIGHT_* constants to CFQ_WEIGHT_* and rename\nblkio_cgroup-\u003eweight to blkio_cgroup-\u003ecfq_weight. We eventually want\nper-policy storage in blkio_cgroup but just mark the ownership of the\nfield for now.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "8a3d26151f24e2a2ffa550890144c3d54d2edb15", "tree": "b99f5cf8db0abc02e39e5c5107f8d4342f81effa", "parents": [ "155fead9b6347ead90e0b0396cb108a6ba6126c6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: move blkio_group_stats_cpu and friends to blk-throttle.c\n\nblkio_group_stats_cpu is used only by blk-throtl and has no reason to\nbe defined in blkcg core.\n\n* Move blkio_group_stats_cpu to blk-throttle.c and rename it to\n tg_stats_cpu.\n\n* blkg_policy_data-\u003estats_cpu is replaced with throtl_grp-\u003estats_cpu.\n prfill functions updated accordingly.\n\n* All related macros / functions are renamed so that they have tg_\n prefix and the unnecessary @pol arguments are dropped.\n\n* Per-cpu stats allocation code is also moved from blk-cgroup.c to\n blk-throttle.c and gets simplified to only deal with\n BLKIO_POLICY_THROTL. percpu stat free is performed by the exit\n method throtl_exit_blkio_group().\n\n* throtl_reset_group_stats() implemented for\n blkio_reset_group_stats_fn method so that tg-\u003estats_cpu can be\n reset.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "155fead9b6347ead90e0b0396cb108a6ba6126c6", "tree": "7e14bb87d942561aa5f44ac8a2d09d6e546c6ccb", "parents": [ "9ade5ea4ce57d3596eaee6a57cd212a483674058" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: move blkio_group_stats to cfq-iosched.c\n\nblkio_group_stats contains only fields used by cfq and has no reason\nto be defined in blkcg core.\n\n* Move blkio_group_stats to cfq-iosched.c and rename it to cfqg_stats.\n\n* blkg_policy_data-\u003estats is replaced with cfq_group-\u003estats.\n blkg_prfill_[rw]stat() are updated to use offset against pd-\u003epdata\n instead.\n\n* All related macros / functions are renamed so that they have cfqg_\n prefix and the unnecessary @pol arguments are dropped.\n\n* All stat functions now take cfq_group * instead of blkio_group *.\n\n* lockdep assertion on queue lock dropped. Elevator runs under queue\n lock by default. There isn\u0027t much to be gained by adding lockdep\n assertions at stat function level.\n\n* cfqg_stats_reset() implemented for blkio_reset_group_stats_fn method\n so that cfqg-\u003estats can be reset.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "9ade5ea4ce57d3596eaee6a57cd212a483674058", "tree": "cad2cc4ecb116f114cc73098b1704a47d82edd18", "parents": [ "41b38b6d540f951c49315d8573e6f6195a6e736d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: add blkio_policy_ops operations for exit and stat reset\n\nAdd blkio_policy_ops-\u003eblkio_exit_group_fn() and\n-\u003eblkio_reset_group_stats_fn(). These will be used to further\nmodularize blkcg policy implementation.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "41b38b6d540f951c49315d8573e6f6195a6e736d", "tree": "e667cec0bba6e7678810ff0087c96547a21a45c7", "parents": [ "629ed0b10209ffc4e1d439e5508d52d5e3a090b8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: cfq doesn\u0027t need per-cpu dispatch stats\n\nblkio_group_stats_cpu is used to count dispatch stats using per-cpu\ncounters. This is used by both blk-throtl and cfq-iosched but the\nsharing is rather silly.\n\n* cfq-iosched doesn\u0027t need per-cpu dispatch stats. cfq always updates\n those stats while holding queue_lock.\n\n* blk-throtl needs per-cpu dispatch stats but only service_bytes and\n serviced. It doesn\u0027t make use of sectors.\n\nThis patch makes cfq add and use global stats for service_bytes,\nserviced and sectors, removes per-cpu sectors counter and moves\nper-cpu stat printing code to blk-throttle.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "629ed0b10209ffc4e1d439e5508d52d5e3a090b8", "tree": "69caa493e4ea0714aff247c8415c4fef7ebfe996", "parents": [ "2ce4d50f9cfab40831eee5e51e950d5c4724994b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:44 2012 -0700" }, "message": "blkcg: move statistics update code to policies\n\nAs with conf/stats file handling code, there\u0027s no reason for stat\nupdate code to live in blkcg core with policies calling into update\nthem. The current organization is both inflexible and complex.\n\nThis patch moves stat update code to specific policies. All\nblkiocg_update_*_stats() functions which deal with BLKIO_POLICY_PROP\nstats are collapsed into their cfq_blkiocg_update_*_stats()\ncounterparts. blkiocg_update_dispatch_stats() is used by both\npolicies and duplicated as throtl_update_dispatch_stats() and\ncfq_blkiocg_update_dispatch_stats(). This will be cleaned up later.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "2ce4d50f9cfab40831eee5e51e950d5c4724994b", "tree": "80dec4f311844b6a2af8a3f621ba9965de345d6d", "parents": [ "60c2bc2d5a12369deef395cda41638d7e6b6bf19" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "cfq: collapse cfq.h into cfq-iosched.c\n\nblock/cfq.h contains some functions which interact with blkcg;\nhowever, this is only part of it and cfq-iosched.c already has quite\nsome #ifdef CONFIG_CFQ_GROUP_IOSCHED. With conf/stat handling being\nmoved to specific policies, having these relay functions isolated in\ncfq.h doesn\u0027t make much sense. Collapse cfq.h into cfq-iosched.c for\nnow. Let\u0027s split blkcg support properly later if necessary.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "60c2bc2d5a12369deef395cda41638d7e6b6bf19", "tree": "67fb6ace87a930215f800f0a96bb33f9773231c7", "parents": [ "44ea53de46a8b01a65ae6217f47e00b516725190" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: move conf/stat file handling code to policies\n\nblkcg conf/stat handling is convoluted in that details which belong to\nspecific policy implementations are all out in blkcg core and then\npolicies hook into core layer to access and manipulate confs and\nstats. This sadly achieves both inflexibility (confs/stats can\u0027t be\nmodified without messing with blkcg core) and complexity (all the\ncall-ins and call-backs).\n\nThe previous patches restructured conf and stat handling code such\nthat they can be separated out. This patch relocates the file\nhandling part. All conf/stat file handling code which belongs to\nBLKIO_POLICY_PROP is moved to cfq-iosched.c and all\nBKLIO_POLICY_THROTL code to blk-throtl.c.\n\nThe move is verbatim except for blkio_update_group_{weight|bps|iops}()\ncallbacks which relays conf changes to policies. The configuration\nsettings are handled in policies themselves so the relaying isn\u0027t\nnecessary. Conf setting functions are modified to directly call\nper-policy update functions and the relaying mechanism is dropped.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "44ea53de46a8b01a65ae6217f47e00b516725190", "tree": "45ccff782042704818d0b3f96221c381209e4a2d", "parents": [ "829fdb50004de78f1bd187e428d72edcd9721cb8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: implement blkio_policy_type-\u003ecftypes\n\nAdd blkiop-\u003ecftypes which is added and removed together with the\npolicy. This will be used to move conf/stat handling to the policies.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "829fdb50004de78f1bd187e428d72edcd9721cb8", "tree": "96dbdb62c97e0b7a9a31a7af6d18a6c34e820528", "parents": [ "726fa6945e6e5f0389bf47a790e1df734a67de54" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: export conf/stat helpers to prepare for reorganization\n\nconf/stat handling is about to be moved to policy implementation from\nblkcg core. Export conf/stat helpers from blkcg core so that\nblk-throttle and cfq-iosched can use them.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "726fa6945e6e5f0389bf47a790e1df734a67de54", "tree": "7119107ef544ccde91bdd6a116b4bdabc15e4bbd", "parents": [ "3a8b31d396b296df4b8594429d86d415d3409432" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: simplify blkg_conf_prep()\n\nblkg_conf_prep() implements \"MAJ:MIN VAL\" parsing manually, which is\nunnecessary. Just use sscanf(\"%u:%u %llu\"). This might not reject\nsome malformed input (extra input at the end) but we don\u0027t care.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "3a8b31d396b296df4b8594429d86d415d3409432", "tree": "fe75761c55f91e558b5899cc284fa9b4134d8167", "parents": [ "c4682aec9caaca1fcfd1dd4b59cef47af22cbdc6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: restructure blkio_group configruation setting\n\nAs part of userland interface restructuring, this patch updates\nper-blkio_group configuration setting. Instead of funneling\neverything through a master function which has hard-coded cases for\neach config file it may handle, the common part is factored into\nblkg_conf_prep() and blkg_conf_finish() and different configuration\nsetters are implemented using the helpers.\n\nWhile this doesn\u0027t result in immediate LOC reduction, this enables\nfurther cleanups and more modular implementation.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "c4682aec9caaca1fcfd1dd4b59cef47af22cbdc6", "tree": "6e20981d877cf3dab29eb265f36edbd309f23761", "parents": [ "627f29f48158c3088cc55a25d8650cae455ff63b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: restructure configuration printing\n\nSimilarly to the previous stat restructuring, this patch restructures\nconf printing code such that,\n\n* Conf printing uses the same helpers as stat.\n\n* Printing function doesn\u0027t require hardcoded switching on the config\n being printed. Note that this isn\u0027t complete yet for throttle\n confs. The next patch will convert setting for these confs and will\n complete the transition.\n\n* Printing uses read_seq_string callback (other methods will be phased\n out).\n\nNote that blkio_group_conf.iops[2] is changed to u64 so that they can\nbe manipulated with the same functions. This is transitional and will\ngo away later.\n\nAfter this patch, per-device configurations - weight, bps and iops -\nuse __blkg_prfill_u64() for printing which uses white space as\ndelimiter instead of tab.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "627f29f48158c3088cc55a25d8650cae455ff63b", "tree": "c8b2eb5250fbf15e5f932d15714b37f2ff6227a7", "parents": [ "d3d32e69fa368e131b25ee68806aa3fd3916cec1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:43 2012 -0700" }, "message": "blkcg: drop blkiocg_file_write_u64()\n\nblkiocg_file_write_u64() has single switch case. Drop\nblkiocg_file_write_u64(), rename blkio_weight_write() to\nblkcg_set_weight() and use it directly for .write_u64 callback.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "d3d32e69fa368e131b25ee68806aa3fd3916cec1", "tree": "f6413e70f38cffb3b363fa831b5f868d90bb6c80", "parents": [ "edcb0722c654947908388df660791abd41e6617c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "message": "blkcg: restructure statistics printing\n\nblkcg stats handling is a mess. None of the stats has much to do with\nblkcg core but they are all implemented in blkcg core. Code sharing\nis achieved by mixing common code with hard-coded cases for each stat\ncounter.\n\nThis patch restructures statistics printing such that\n\n* Common logic exists as helper functions and specific print functions\n use the helpers to implement specific cases.\n\n* Printing functions serving multiple counters don\u0027t require hardcoded\n switching on specific counters.\n\n* Printing uses read_seq_string callback (other methods will be phased\n out).\n\nThis change enables further cleanups and relocating stats code to the\npolicy implementation it belongs to.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "edcb0722c654947908388df660791abd41e6617c", "tree": "8c44dd4517bd562b58216dd01fb5abc42cb74a95", "parents": [ "2aa4a1523b40a065bc3a31e20097ea7a618ec3de" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "message": "blkcg: introduce blkg_stat and blkg_rwstat\n\nblkcg uses u64_stats_sync to avoid reading wrong u64 statistic values\non 32bit archs and some stat counters have subtypes to distinguish\nread/writes and sync/async IOs. The stat code paths are confusing and\ninvolve a lot of going back and forth between blkcg core and specific\npolicy implementations, and synchronization and subtype handling are\nopen coded in blkcg core.\n\nThis patch introduces struct blkg_stat and blkg_rwstat which, with\naccompanying operations, encapsulate stat updating and accessing with\nproper synchronization.\n\nblkg_stat is simple u64 counter with 64bit read-access protection.\nblkg_rwstat is the one with rw and [a]sync subcounters and takes @rw\nflags to distinguish IO subtypes (%REQ_WRITE and %REQ_SYNC) and\nreplaces stat_sub_type indexed arrays.\n\nAll counters in blkio_group_stats and blkio_group_stats_cpu are\nreplaced with either blkg_stat or blkg_rwstat along with all users.\n\nThis does add one u64_stats_sync per counter and increase stats_sync\noperations but they\u0027re empty/noops on 64bit archs and blkcg doesn\u0027t\nhave too many counters, especially with DEBUG_BLK_CGROUP off.\n\nWhile the currently resulting code isn\u0027t necessarily simpler at the\nmoment, this will enable further clean up of blkcg stats code.\n\n- BLKIO_STAT_{READ|WRITE|SYNC|ASYNC|TOTAL} renamed to\n BLKG_RWSTAT_{READ|WRITE|SYNC|ASYNC|TOTAL}.\n\n- blkg_stat_add() replaces blkio_add_stat() and\n blkio_check_and_dec_stat(). Note that BUG_ON() on underflow in the\n latter function no longer exists. It\u0027s *way* better to have\n underflowed stat counters than oopsing.\n\n- blkio_group_stats-\u003edequeue is now a proper u64 stat counter instead\n of ulong.\n\n- reset_stats() updated to clear each stat counters individually and\n BLKG_STATS_DEBUG_CLEAR_{START|SIZE} are removed.\n\n- Some functions reconstruct rw flags from direction and sync\n booleans. This will be removed by future patches.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "2aa4a1523b40a065bc3a31e20097ea7a618ec3de", "tree": "b4fb9e7e593d539f70c61c2d7b39b0028edf08eb", "parents": [ "aaec55a002a29bf940588dc03253099a4cd543bf" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "message": "blkcg: BLKIO_STAT_CPU_SECTORS doesn\u0027t have subcounters\n\nBLKIO_STAT_CPU_SECTORS doesn\u0027t need read/write/sync/async subcounters\nand is counted by blkio_group_stats_cpu-\u003esectors; however, it still\nholds a member in blkio_group_stats_cpu-\u003estat_arr_cpu.\n\nRearrange stat_type_cpu and define BLKIO_STAT_CPU_ARR_NR and use it\nfor stat_arr_cpu[] size so that only SERVICE_BYTES and SERVICED have\nsubcounters.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "aaec55a002a29bf940588dc03253099a4cd543bf", "tree": "2fb146599db30c25abca72e52516d1c5f2c4e21e", "parents": [ "959d851caa48829eb85cb85aa949fd6b4c5d5bc6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 14:38:42 2012 -0700" }, "message": "blkcg: remove unused @pol and @plid parameters\n\n@pol to blkg_to_pdata() and @plid to blkg_lookup_create() are no\nlonger necessary. Drop them.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "5bf14c0727a07ded1bd9fa6d77923d7e6dc32833", "tree": "db1c4db0ece7ec7f416c9581eef3bdf172a73864", "parents": [ "8bcb6c7d48eb341b1f49f814cdcbe05eb6f15680" ], "author": { "name": "Tao Ma", "email": "boyu.mt@taobao.com", "time": "Sun Apr 01 14:33:39 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Sun Apr 01 14:33:39 2012 -0700" }, "message": "block: Make cfq_target_latency tunable through sysfs.\n\nIn cfq, when we calculate a time slice for a process(or a cfqq to\nbe precise), we have to consider the cfq_target_latency so that all the\nsync request have an estimated latency(300ms) and it is controlled by\ncfq_target_latency. But in some hadoop test, we have found that if\nthere are many processes doing sequential read(24 for example), the\nthroughput is bad because every process can only work for about 25ms\nand the cfqq is switched. That leads to a higher disk seek. We can\nachive the good throughput by setting low_latency\u003d0, but then some\nread\u0027s latency is too much for the application.\n\nSo this patch makes cfq_target_latency tunable through sysfs so that\nwe can tune it and find some magic number which is not bad for both\nthe throughput and the read latency.\n\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "959d851caa48829eb85cb85aa949fd6b4c5d5bc6", "tree": "3ba9c94ec346275fb44c4f0d1cd2537cdff8d811", "parents": [ "a5567932fc926739e29e98487128080f40c61710", "48ddbe194623ae089cc0576e60363f2d2e85662a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:30:01 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:55:00 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of ../cgroup into block/for-3.5/core-merged\n\ncgroup/for-3.5 contains the following changes which blk-cgroup needs\nto proceed with the on-going cleanup.\n\n* Dynamic addition and removal of cftypes to make config/stat file\n handling modular for policies.\n\n* cgroup removal update to not wait for css references to drain to fix\n blkcg removal hang caused by cfq caching cfqgs.\n\nPull in cgroup/for-3.5 into block/for-3.5/core. This causes the\nfollowing conflicts in block/blk-cgroup.c.\n\n* 761b3ef50e \"cgroup: remove cgroup_subsys argument from callbacks\"\n conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()\n removal. Resolved by removing @subsys from all subsys methods.\n\n* 676f7c8f84 \"cgroup: relocate cftype and cgroup_subsys definitions in\n controllers\" conflicts with -\u003epre_destroy() and -\u003eattach() updates\n and removal of modular config. Resolved by dropping forward\n declarations of the methods and applying updates to the relocated\n blkio_subsys.\n\n* 4baf6e3325 \"cgroup: convert all non-memcg controllers to the new\n cftype interface\" builds upon the previous item. Resolved by adding\n -\u003ebase_cftypes to the relocated blkio_subsys.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "4baf6e33251b37f111e21289f8ee71fe4cce236e", "tree": "7decc386a60679fd2696041810cf331c0daf1f41", "parents": [ "676f7c8f84d15e94065841529016da5ab92e901b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:09:55 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:09:55 2012 -0700" }, "message": "cgroup: convert all non-memcg controllers to the new cftype interface\n\nConvert debug, freezer, cpuset, cpu_cgroup, cpuacct, net_prio, blkio,\nnet_cls and device controllers to use the new cftype based interface.\nTermination entry is added to cftype arrays and populate callbacks are\nreplaced with cgroup_subsys-\u003ebase_cftypes initializations.\n\nThis is functionally identical transformation. There shouldn\u0027t be any\nvisible behavior change.\n\nmemcg is rather special and will be converted separately.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\n" }, { "commit": "676f7c8f84d15e94065841529016da5ab92e901b", "tree": "29c267a4c5711f9eaca7fa88fd7a78d39c8c4eac", "parents": [ "6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:09:55 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:09:55 2012 -0700" }, "message": "cgroup: relocate cftype and cgroup_subsys definitions in controllers\n\nblk-cgroup, netprio_cgroup, cls_cgroup and tcp_memcontrol\nunnecessarily define cftype array and cgroup_subsys structures at the\ntop of the file, which is unconventional and necessiates forward\ndeclaration of methods.\n\nThis patch relocates those below the definitions of the methods and\nremoves the forward declarations. Note that forward declaration of\ntcp_files[] is added in tcp_memcontrol.c for tcp_init_cgroup(). This\nwill be removed soon by another patch.\n\nThis patch doesn\u0027t introduce any functional change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "8bcb6c7d48eb341b1f49f814cdcbe05eb6f15680", "tree": "83ff62ab93d0cf2c2687e5ca8799cac4c5dcfa25", "parents": [ "00380a404fc4235e9b8b39598138bd3223a27b8a" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Fri Mar 30 12:33:28 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Mar 30 12:33:28 2012 +0200" }, "message": "block: use lockdep_assert_held for queue locking\n\nInstead of an ugly open coded variant.\n\nCc: axboe@kernel.dk\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "a5567932fc926739e29e98487128080f40c61710", "tree": "8bd1995697c0c86f605a6ddb213312454ac7f467", "parents": [ "eb7d8c07f9c5fca6190b0d328179551122d1b8a3" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Mar 29 20:57:08 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Mar 29 20:57:08 2012 +0200" }, "message": "blkcg: change a spin_lock() to spin_lock_irq()\n\nSmatch complains that we re-enable IRQs twice. It looks like we forgot\nto disable them here on the spin_trylock() failure path. This was added\nin 9f13ef678e \"blkcg: use double locking instead of RCU for blkg\nsynchronization\".\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e`\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "eb7d8c07f9c5fca6190b0d328179551122d1b8a3", "tree": "b75cd8a91faee93990ec03f0044d24111e51a918", "parents": [ "2b566fa55b9a94b53217c2818e6c5e5756eeb1a1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Mar 23 14:02:53 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Mar 23 14:02:53 2012 +0100" }, "message": "cfq: fix cfqg ref handling when BLK_CGROUP \u0026\u0026 !CFQ_GROUP_IOSCHED\n\nWhen BLK_CGROUP is enabled but CFQ_GROUP_IOSCHED is, cfq ends up\ncalling blkg_get/put() on dummy cfqg leading to the following crash.\n\n BUG: unable to handle kernel NULL pointer dereference at 00000000000000b0\n IP: [\u003cffffffff813d44d8\u003e] cfq_init_queue+0x258/0x430\n PGD 0\n Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC\n CPU 0\n Modules linked in:\n\n Pid: 1, comm: swapper/0 Not tainted 3.3.0-rc6-work+ #125 Bochs Bochs\n RIP: 0010:[\u003cffffffff813d44d8\u003e] [\u003cffffffff813d44d8\u003e] cfq_init_queue+0x258/0x430\n RSP: 0018:ffff88001f9dfd80 EFLAGS: 00010046\n RAX: ffff88001aefbbf0 RBX: ffff88001aeedbf0 RCX: 0000000000000100\n RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffff820ffd40\n RBP: ffff88001f9dfdd0 R08: 0000000000000000 R09: 0000000000000001\n R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000\n R13: 0000000000000009 R14: ffff88001aefbc30 R15: 0000000000000003\n FS: 0000000000000000(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 00000000000000b0 CR3: 000000000206f000 CR4: 00000000000006f0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process swapper/0 (pid: 1, threadinfo ffff88001f9de000, task ffff88001f9dc040)\n Stack:\n ffff88001aeedbf0 ffff88001aefbdb0 ffff88001aef1548 ffff88001aefbbf0\n ffff88001f9dfdd0 ffff88001aef1548 ffffffff820d6320 ffffffff8165ce30\n ffffffff82c555e0 ffff88001aeebbf0 ffff88001f9dfe00 ffffffff813b0507\n Call Trace:\n [\u003cffffffff813b0507\u003e] elevator_init+0xd7/0x140\n [\u003cffffffff813b83d5\u003e] blk_init_allocated_queue+0x125/0x150\n [\u003cffffffff813b94d3\u003e] blk_init_queue_node+0x43/0x80\n [\u003cffffffff813b9523\u003e] blk_init_queue+0x13/0x20\n [\u003cffffffff821aec00\u003e] floppy_init+0x82/0xec7\n [\u003cffffffff810001d2\u003e] do_one_initcall+0x42/0x170\n [\u003cffffffff821835fc\u003e] kernel_init+0xcb/0x14f\n [\u003cffffffff81b40b24\u003e] kernel_thread_helper+0x4/0x10\n Code: 00 e8 1d 9e 76 00 48 8b 43 48 48 85 c0 48 89 83 28 03 00 00 74 07 4c 8b a0 10 ff ff ff 8b 15 b0 2e d0 00 85 d2 0f 85 49 01 00 00 \u003c41\u003e 8b 84 24 b0 00 00 00 85 c0 0f 8e 8c 01 00 00 83 e8 01 85 c0\n RIP [\u003cffffffff813d44d8\u003e] cfq_init_queue+0x258/0x430\n\nBecause cfq\u0027s blkcg support has a on/off switch, CFQ_GROUP_IOSCHED,\nseparate from BLK_CGROUP, blkg access through cfqg needs to be\nconditioned on it.\n\n* Make blkg_to_cfqg() and cfqg_to_blkg() conditioned on\n CFQ_GROUP_IOSCHED. If disabled, they always return %NULL.\n\n* Introduce cfqg_get() and cfqg_put() conditioned on\n CFQ_GROUP_IOSCHED. If disabled, they are noops.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "00380a404fc4235e9b8b39598138bd3223a27b8a", "tree": "03bbdd6c312392e243539cb29f47f65e7bfe761a", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Mar 23 09:58:54 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Mar 23 09:58:54 2012 +0100" }, "message": "block: blk_alloc_queue_node(): use caller\u0027s GFP flags instead of GFP_KERNEL\n\nWe should use the GFP flags that the caller specified instead of picking\nour own. All the callers specify GFP_KERNEL so this doesn\u0027t make a\ndifference to how the kernel runs, it\u0027s just a cleanup.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0d9cabdccedb79ee5f27b77ff51f29a9e7d23275", "tree": "8bfb64c3672d058eb90aec3c3a9c4f61cef9097c", "parents": [ "701085b219016d38f105b031381b9cee6200253a", "3ce3230a0cff484e5130153f244d4fb8a56b3a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"Out of the 8 commits, one fixes a long-standing locking issue around\n tasklist walking and others are cleanups.\"\n\n* \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list\n cgroup: Remove wrong comment on cgroup_enable_task_cg_list()\n cgroup: remove cgroup_subsys argument from callbacks\n cgroup: remove extra calls to find_existing_css_set\n cgroup: replace tasklist_lock with rcu_read_lock\n cgroup: simplify double-check locking in cgroup_attach_proc\n cgroup: move struct cgroup_pidlist out from the header file\n cgroup: remove cgroup_attach_task_current_cg()\n" }, { "commit": "2ba68940c893c8f0bfc8573c041254251bb6aeab", "tree": "fa83ebb01d32abd98123fa28f9f6f0b3eaeee25d", "parents": [ "9c2b957db1772ebf942ae7a9346b14eba6c8ca66", "600e145882802d6ccbfe2c4aea243d97caeb91a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes for v3.4 from Ingo Molnar\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)\n printk: Make it compile with !CONFIG_PRINTK\n sched/x86: Fix overflow in cyc2ns_offset\n sched: Fix nohz load accounting -- again!\n sched: Update yield() docs\n printk/sched: Introduce special printk_sched() for those awkward moments\n sched/nohz: Correctly initialize \u0027next_balance\u0027 in \u0027nohz\u0027 idle balancer\n sched: Cleanup cpu_active madness\n sched: Fix load-balance wreckage\n sched: Clean up parameter passing of proc_sched_autogroup_set_nice()\n sched: Ditch per cgroup task lists for load-balancing\n sched: Rename load-balancing fields\n sched: Move load-balancing arguments into helper struct\n sched/rt: Do not submit new work when PI-blocked\n sched/rt: Prevent idle task boosting\n sched/wait: Add __wake_up_all_locked() API\n sched/rt: Document scheduler related skip-resched-check sites\n sched/rt: Use schedule_preempt_disabled()\n sched/rt: Add schedule_preempt_disabled()\n sched/rt: Do not throttle when PI boosting\n sched/rt: Keep period timer ticking when rt throttling is active\n ...\n" }, { "commit": "2b566fa55b9a94b53217c2818e6c5e5756eeb1a1", "tree": "d2186ebd18062172a7b0c83e31ca834f44ecdcc0", "parents": [ "598971bfbdfdc8701337dc1636c7919c44699914" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 19 15:10:59 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:47:48 2012 +0100" }, "message": "block: remove ioc_*_changed()\n\nAfter the previous patch to cfq, there\u0027s no ioc_get_changed() user\nleft. This patch yanks out ioc_{ioprio|cgroup|get}_changed() and all\nrelated stuff.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "598971bfbdfdc8701337dc1636c7919c44699914", "tree": "3de33d5059ce3a0cf77a9735804335f9264b7c08", "parents": [ "abede6da27d9bd62ea9512830c83e32b3ee1104c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 19 15:10:58 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:47:47 2012 +0100" }, "message": "cfq: don\u0027t use icq_get_changed()\n\ncfq caches the associated cfqq\u0027s for a given cic. The cache needs to\nbe flushed if the cic\u0027s ioprio or blkcg has changed. It is currently\ndone by requiring the changing action to set the respective\nICQ_*_CHANGED bit in the icq and testing it from cfq_set_request(),\nwhich involves iterating through all the affected icqs.\n\nAll cfq wants to know is whether ioprio and/or blkcg have changed\nsince the last flush and can be easily achieved by just remembering\nthe current ioprio and blkcg ID in cic.\n\nThis patch adds cic-\u003e{ioprio|blkcg_id}, updates all ioprio users to\nuse the remembered value instead, and updates cfq_set_request() path\nsuch that, instead of using icq_get_changed(), the current values are\ncompared against the remembered ones and trigger appropriate flush\naction if not. Condition tests are moved inside both _changed\nfunctions which are now named check_ioprio_changed() and\ncheck_blkcg_changed().\n\nioprio.h::task_ioprio*() can\u0027t be used anymore and replaced with\nopen-coded IOPRIO_CLASS_NONE case in cfq_async_queue_prio().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "abede6da27d9bd62ea9512830c83e32b3ee1104c", "tree": "6ddd5ddec15f0b5a8c9c1905bbb57d5a164d37ca", "parents": [ "9a9e8a26da4c2c5ddc60999bdea957935fb22b6b" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 19 15:10:57 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:47:47 2012 +0100" }, "message": "cfq: pass around cfq_io_cq instead of io_context\n\nNow that io_cq is managed by block core and guaranteed to exist for\nany in-flight request, it is easier and carries more information to\npass around cfq_io_cq than io_context.\n\nThis patch updates cfq_init_prio_data(), cfq_find_alloc_queue() and\ncfq_get_queue() to take @cic instead of @ioc. This change removes a\nduplicate cfq_cic_lookup() from cfq_find_alloc_queue().\n\nThis change enables the use of cic-cached ioprio in the next patch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "9a9e8a26da4c2c5ddc60999bdea957935fb22b6b", "tree": "5a42ef29c2c34174390e4ccf9a2924c0ade6f340", "parents": [ "edf1b879e308d37b5b7c414476ab39f79650a253" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 19 15:10:56 2012 -0700" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:47:47 2012 +0100" }, "message": "blkcg: add blkcg-\u003eid\n\nAdd 64bit unique id to blkcg. This will be used by policies which\nwant blkcg identity test to tell whether the associated blkcg has\nchanged.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "edf1b879e308d37b5b7c414476ab39f79650a253", "tree": "fec2895e806eb357ba9e9ed960f8c247042d5383", "parents": [ "c4c76a05382c7d05e0b911daa58a827399e9ba1a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 08 10:54:00 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:45:37 2012 +0100" }, "message": "blkcg: remove blkio_group-\u003estats_lock\n\nWith recent plug merge updates, all non-percpu stat updates happen\nunder queue_lock making stats_lock unnecessary to synchronize stat\nupdates. The only synchronization necessary is stat reading, which\ncan be done using u64_stats_sync instead.\n\nThis patch removes blkio_group-\u003estats_lock and adds\nblkio_group_stats-\u003esyncp for reader synchronization.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "c4c76a05382c7d05e0b911daa58a827399e9ba1a", "tree": "e89f1edb9890a4b857f75dbdb4a0fb77d9aafa59", "parents": [ "997a026c80c3cc05f82e589aced1f0011c17d376" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 08 10:53:59 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:45:37 2012 +0100" }, "message": "blkcg: restructure blkio_get_stat()\n\nRestructure blkio_get_stat() to prepare for removal of stats_lock.\n\n* Define BLKIO_STAT_ARR_NR explicitly to denote which stats have\n subtypes instead of using BLKIO_STAT_QUEUED.\n\n* Separate out stat acquisition and printing. After this, there are\n only two users of blkio_fill_stat(). Just open code it.\n\n* The code was mixing MAX_KEY_LEN and MAX_KEY_LEN - 1. There\u0027s no\n need to subtract one. Use MAX_KEY_LEN consistently.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "997a026c80c3cc05f82e589aced1f0011c17d376", "tree": "905fe49970f8549663e1e70e77dd04811fd14c9c", "parents": [ "5fe224d2d5fbf8f020b30d0ba69fed7856923752" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 08 10:53:58 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:45:37 2012 +0100" }, "message": "blkcg: simplify stat reset\n\nblkiocg_reset_stats() implements stat reset for blkio.reset_stats\ncgroupfs file. This feature is very unconventional and something\nwhich shouldn\u0027t have been merged. It\u0027s only useful when there\u0027s only\none user or tool looking at the stats. As soon as multiple users\nand/or tools are involved, it becomes useless as resetting disrupts\nother usages. There are very good reasons why all other stats expect\nreaders to read values at the start and end of a period and subtract\nto determine delta over the period.\n\nThe implementation is rather complex - some fields shouldn\u0027t be\ncleared and it saves some fields, resets whole and restores for some\nreason. Reset of percpu stats is also racy. The comment points to\n64bit store atomicity for the reason but even without that stores for\nzero can simply race with other CPUs doing RMW and get clobbered.\n\nSimplify reset by\n\n* Clear selectively instead of resetting and restoring.\n\n* Grouping debug stat fields to be reset and using memset() over them.\n\n* Not caring about stats_lock.\n\n* Using memset() to reset percpu stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "5fe224d2d5fbf8f020b30d0ba69fed7856923752", "tree": "26941c40cd28c4f7070e8edab338d340afd2bc99", "parents": [ "1cd9e039fc258f91fe38b97b3c622b13a3b8a795" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 08 10:53:57 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:45:37 2012 +0100" }, "message": "blkcg: don\u0027t use percpu for merged stats\n\nWith recent plug merge updates, merged stats are no longer called for\nplug merges and now only updated while holding queue_lock. As\nstats_lock is scheduled to be removed, there\u0027s no reason to use percpu\nfor merged stats. Don\u0027t use percpu for merged stats.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "1cd9e039fc258f91fe38b97b3c622b13a3b8a795", "tree": "908f9747124b24ea4413025ab9294bd7d026b4f8", "parents": [ "671058fb2a2aac4e70f01b316b06bc59b98bd138" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Thu Mar 08 10:53:56 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 20 12:45:37 2012 +0100" }, "message": "blkcg: alloc per cpu stats from worker thread in a delayed manner\n\nCurrent per cpu stat allocation assumes GFP_KERNEL allocation flag. But in\nIO path there are times when we want GFP_NOIO semantics. As there is no\nway to pass the allocation flags to alloc_percpu(), this patch delays the\nallocation of stats using a worker thread.\n\nv2-\u003e tejun suggested following changes. Changed the patch accordingly.\n\t- move alloc_node location in structure\n\t- reduce the size of names of some of the fields\n\t- Reduce the scope of locking of alloc_list_lock\n\t- Simplified stat_alloc_fn() by allocating stats for all\n\t policies in one go and then assigning these to a group.\n\nv3 -\u003e Andrew suggested to put some comments in the code. Also raised\n concerns about trying to allocate infinitely in case of allocation\n failure. I have changed the logic to sleep for 10ms before retrying.\n That should take care of non-preemptible UP kernels.\n\nv4 -\u003e Tejun had more suggestions.\n\t- drop list_for_each_entry_all()\n\t- instead of msleep() use queue_delayed_work()\n\t- Some cleanups realted to more compact coding.\n\nv5-\u003e tejun suggested more cleanups leading to more compact code.\n\ntj: - Relocated pcpu_stats into blkio_stat_alloc_fn().\n - Minor comment update.\n - This also fixes suspicious RCU usage warning caused by invoking\n cgroup_path() from blkg_alloc() without holding RCU read lock.\n Now that blkg_alloc() doesn\u0027t require sleepable context, RCU\n read lock from blkg_lookup_create() is maintained throughout\n blkg_alloc().\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f1cbd03f5eabb75ea8ace23b47d2209f10871c16", "tree": "2ac398bd1a50ce135461fae5b5e91ba05831af84", "parents": [ "ff398c45b03d9d64135d928c0146d8c38a70fd3b", "ff8c1474cc2f5e11414c71ec4d739c18e6e669c0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 14 17:16:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 14 17:16:45 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nPull block fixes from Jens Axboe:\n \"Been sitting on this for a while, but lets get this out the door.\n This fixes various important bugs for 3.3 final, along with a few more\n trivial ones. Please pull!\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix ioc leak in put_io_context\n block, sx8: fix pointer math issue getting fw version\n Block: use a freezable workqueue for disk-event polling\n drivers/block/DAC960: fix -Wuninitialized warning\n drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning\n block: fix __blkdev_get and add_disk race condition\n block: Fix setting bio flags in drivers (sd_dif/floppy)\n block: Fix NULL pointer dereference in sd_revalidate_disk\n block: exit_io_context() should call elevator_exit_icq_fn()\n block: simplify ioc_release_fn()\n block: replace icq-\u003echanged with icq-\u003eflags\n" }, { "commit": "ff8c1474cc2f5e11414c71ec4d739c18e6e669c0", "tree": "d498e6e97243a25d20100b9c5a1cee8c73920fb7", "parents": [ "ea5f4db8ece896c2ab9eafa0924148a2596c52e4" ], "author": { "name": "Xiaotian Feng", "email": "xtfeng@gmail.com", "time": "Wed Mar 14 15:34:48 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Mar 14 15:34:48 2012 +0100" }, "message": "block: fix ioc leak in put_io_context\n\nWhen put_io_context is called, if ioc-\u003eicq_list is empty and refcount\nis 1, kernel will not free the ioc.\n\nThis is caught by following kmemleak:\n\nunreferenced object 0xffff880036349fe0 (size 216):\n comm \"sh\", pid 2137, jiffies 4294931140 (age 290579.412s)\n hex dump (first 32 bytes):\n 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................\n 01 00 01 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........\n backtrace:\n [\u003cffffffff8169f926\u003e] kmemleak_alloc+0x26/0x50\n [\u003cffffffff81195a9c\u003e] kmem_cache_alloc_node+0x1cc/0x2a0\n [\u003cffffffff81356b67\u003e] create_io_context_slowpath+0x27/0x130\n [\u003cffffffff81356d2b\u003e] get_task_io_context+0xbb/0xf0\n [\u003cffffffff81055f0e\u003e] copy_process+0x188e/0x18b0\n [\u003cffffffff8105609b\u003e] do_fork+0x11b/0x420\n [\u003cffffffff810247f8\u003e] sys_clone+0x28/0x30\n [\u003cffffffff816d3373\u003e] stub_clone+0x13/0x20\n [\u003cffffffffffffffff\u003e] 0xffffffffffffffff\n\nioc should be freed if ioc-\u003eicq_list is empty.\nSigned-off-by: Xiaotian Feng \u003cdannyfeng@tencent.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "671058fb2a2aac4e70f01b316b06bc59b98bd138", "tree": "6c49961409ad0e3c16b5e2027f515cafecedf39a", "parents": [ "4f85cb96d9d2fbbb7160db855a6beee1baced5e5" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:29 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: make blk-throttle preserve the issuing task on delayed bios\n\nMake blk-throttle call bio_associate_current() on bios being delayed\nsuch that they get issued to block layer with the original io_context.\nThis allows stacking blk-throttle and cfq-iosched propio policies.\nbios will always be issued with the correct ioc and blkcg whether it\ngets delayed by blk-throttle or not.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "4f85cb96d9d2fbbb7160db855a6beee1baced5e5", "tree": "5472bba04490da05fa6ca8f780431b37bd7375cb", "parents": [ "852c788f8365062c8a383c5a93f7f7289977cb50" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:28 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: make block cgroup policies follow bio task association\n\nImplement bio_blkio_cgroup() which returns the blkcg associated with\nthe bio if exists or %current\u0027s blkcg, and use it in blk-throttle and\ncfq-iosched propio. This makes both cgroup policies honor task\nassociation for the bio instead of always assuming %current.\n\nAs nobody is using bio_set_task() yet, this doesn\u0027t introduce any\nbehavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "852c788f8365062c8a383c5a93f7f7289977cb50", "tree": "561b69e7f2b6bcc16de165b3b988990de7913615", "parents": [ "f6e8d01bee036460e03bd4f6a79d014f98ba712e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:27 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: implement bio_associate_current()\n\nIO scheduling and cgroup are tied to the issuing task via io_context\nand cgroup of %current. Unfortunately, there are cases where IOs need\nto be routed via a different task which makes scheduling and cgroup\nlimit enforcement applied completely incorrectly.\n\nFor example, all bios delayed by blk-throttle end up being issued by a\ndelayed work item and get assigned the io_context of the worker task\nwhich happens to serve the work item and dumped to the default block\ncgroup. This is double confusing as bios which aren\u0027t delayed end up\nin the correct cgroup and makes using blk-throttle and cfq propio\ntogether impossible.\n\nAny code which punts IO issuing to another task is affected which is\ngetting more and more common (e.g. btrfs). As both io_context and\ncgroup are firmly tied to task including userland visible APIs to\nmanipulate them, it makes a lot of sense to match up tasks to bios.\n\nThis patch implements bio_associate_current() which associates the\nspecified bio with %current. The bio will record the associated ioc\nand blkcg at that point and block layer will use the recorded ones\nregardless of which task actually ends up issuing the bio. bio\nrelease puts the associated ioc and blkcg.\n\nIt grabs and remembers ioc and blkcg instead of the task itself\nbecause task may already be dead by the time the bio is issued making\nioc and blkcg inaccessible and those are all block layer cares about.\n\nelevator_set_req_fn() is updated such that the bio elvdata is being\nallocated for is available to the elevator.\n\nThis doesn\u0027t update block cgroup policies yet. Further patches will\nimplement the support.\n\n-v2: #ifdef CONFIG_BLK_CGROUP added around bio-\u003ebi_ioc dereference in\n rq_ioc() to fix build breakage.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Kent Overstreet \u003ckoverstreet@google.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f6e8d01bee036460e03bd4f6a79d014f98ba712e", "tree": "acaaab3667e0450f0f05464426c3540c89ce4e18", "parents": [ "3d48749d93a3dce732dd30a14002ab90ec4355f3" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:26 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: add io_context-\u003eactive_ref\n\nCurrently ioc-\u003enr_tasks is used to decide two things - whether an ioc\nis done issuing IOs and whether it\u0027s shared by multiple tasks. This\npatch separate out the first into ioc-\u003eactive_ref, which is acquired\nand released using {get|put}_io_context_active() respectively.\n\nThis will be used to associate bio\u0027s with a given task. This patch\ndoesn\u0027t introduce any visible behavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "24acfc34fba0b4f62ef9d5c2616eb0faa802b606", "tree": "42d07b0e4ad922b24853fe542cb9ab543aa8174c", "parents": [ "b679281a6410676a41b175c5a185150a1ae42f9d" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:24 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: interface update for ioc/icq creation functions\n\nMake the following interface updates to prepare for future ioc related\nchanges.\n\n* create_io_context() returning ioc only works for %current because it\n doesn\u0027t increment ref on the ioc. Drop @task parameter from it and\n always assume %current.\n\n* Make create_io_context_slowpath() return 0 or -errno and rename it\n to create_task_io_context().\n\n* Make ioc_create_icq() take @ioc as parameter instead of assuming\n that of %current. The caller, get_request(), is updated to create\n ioc explicitly and then pass it into ioc_create_icq().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "b679281a6410676a41b175c5a185150a1ae42f9d", "tree": "f3966a921a4c07ebf80d57a46a80ef0a71e8354a", "parents": [ "c875f4d0250a1f070fa26087a73bdd8f54c48100" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:23 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: restructure get_request()\n\nget_request() is structured a bit unusually in that failure path is\ninlined in the usual flow with goto labels atop and inside it.\nRelocate the error path to the end of the function.\n\nThis is to prepare for icq handling changes in get_request() and\ndoesn\u0027t introduce any behavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "c875f4d0250a1f070fa26087a73bdd8f54c48100", "tree": "4ed2bae2fc48e54ac712d28eaaae8217c8064c1d", "parents": [ "9f13ef678efd977487fc0c2e489f17c9a8c67a3e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:22 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "blkcg: drop unnecessary RCU locking\n\nNow that blkg additions / removals are always done under both q and\nblkcg locks, the only places RCU locking is necessary are\nblkg_lookup[_create]() for lookup w/o blkcg lock. This patch drops\nunncessary RCU locking replacing it with plain blkcg locking as\nnecessary.\n\n* blkiocg_pre_destroy() already perform proper locking and don\u0027t need\n RCU. Dropped.\n\n* blkio_read_blkg_stats() now uses blkcg-\u003elock instead of RCU read\n lock. This isn\u0027t a hot path.\n\n* Now unnecessary synchronize_rcu() from queue exit paths removed.\n This makes q-\u003enr_blkgs unnecessary. Dropped.\n\n* RCU annotation on blkg-\u003eq removed.\n\n-v2: Vivek pointed out that blkg_lookup_create() still needs to be\n called under rcu_read_lock(). Updated.\n\n-v3: After the update, stats_lock locking in blkio_read_blkg_stats()\n shouldn\u0027t be using _irq variant as it otherwise ends up enabling\n irq while blkcg-\u003elock is locked. Fixed.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "9f13ef678efd977487fc0c2e489f17c9a8c67a3e", "tree": "e58a2dd153ad24b2ea173d5dfb575c507e1f7589", "parents": [ "e8989fae38d9831c72b20375a206a919ca468c52" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:21 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "blkcg: use double locking instead of RCU for blkg synchronization\n\nblkgs are chained from both blkcgs and request_queues and thus\nsubjected to two locks - blkcg-\u003elock and q-\u003equeue_lock. As both blkcg\nand q can go away anytime, locking during removal is tricky. It\u0027s\ncurrently solved by wrapping removal inside RCU, which makes the\nsynchronization complex. There are three locks to worry about - the\nouter RCU, q lock and blkcg lock, and it leads to nasty subtle\ncomplications like conditional synchronize_rcu() on queue exit paths.\n\nFor all other paths, blkcg lock is naturally nested inside q lock and\nthe only exception is blkcg removal path, which is a very cold path\nand can be implemented as clumsy but conceptually-simple reverse\ndouble lock dancing.\n\nThis patch updates blkg removal path such that blkgs are removed while\nholding both q and blkcg locks, which is trivial for request queue\nexit path - blkg_destroy_all(). The blkcg removal path,\nblkiocg_pre_destroy(), implements reverse double lock dancing\nessentially identical to ioc_release_fn().\n\nThis simplifies blkg locking - no half-dead blkgs to worry about. Now\nunnecessary RCU annotations will be removed by the next patch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "e8989fae38d9831c72b20375a206a919ca468c52", "tree": "2eeb1320e526cd0ba187465c0e6e19799dc1b956", "parents": [ "03aa264ac15637b6f98374270bcdf31400965505" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:20 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: unify blkg\u0027s for blkcg policies\n\nCurrently, blkg is per cgroup-queue-policy combination. This is\nunnatural and leads to various convolutions in partially used\nduplicate fields in blkg, config / stat access, and general management\nof blkgs.\n\nThis patch make blkg\u0027s per cgroup-queue and let them serve all\npolicies. blkgs are now created and destroyed by blkcg core proper.\nThis will allow further consolidation of common management logic into\nblkcg core and API with better defined semantics and layering.\n\nAs a transitional step to untangle blkg management, elvswitch and\npolicy [de]registration, all blkgs except the root blkg are being shot\ndown during elvswitch and bypass. This patch adds blkg_root_update()\nto update root blkg in place on policy change. This is hacky and racy\nbut should be good enough as interim step until we get locking\nsimplified and switch over to proper in-place update for all blkgs.\n\n-v2: Root blkgs need to be updated on elvswitch too and blkg_alloc()\n comment wasn\u0027t updated according to the function change. Fixed.\n Both pointed out by Vivek.\n\n-v3: v2 updated blkg_destroy_all() to invoke update_root_blkg_pd() for\n all policies. This freed root pd during elvswitch before the\n last queue finished exiting and led to oops. Directly invoke\n update_root_blkg_pd() only on BLKIO_POLICY_PROP from\n cfq_exit_queue(). This also is closer to what will be done with\n proper in-place blkg update. Reported by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "03aa264ac15637b6f98374270bcdf31400965505", "tree": "6fa9ca54d3f775fba19123790f6655158034a1d8", "parents": [ "4eef3049986e8397d5003916aed8cad6567a5e02" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:19 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: let blkcg core manage per-queue blkg list and counter\n\nWith the previous patch to move blkg list heads and counters to\nrequest_queue and blkg, logic to manage them in both policies are\nalmost identical and can be moved to blkcg core.\n\nThis patch moves blkg link logic into blkg_lookup_create(), implements\ncommon blkg unlink code in blkg_destroy(), and updates\nblkg_destory_all() so that it\u0027s policy specific and can skip root\ngroup. The updated blkg_destroy_all() is now used to both clear queue\nfor bypassing and elv switching, and release all blkgs on q exit.\n\nThis patch introduces a race window where policy [de]registration may\nrace against queue blkg clearing. This can only be a problem on cfq\nunload and shouldn\u0027t be a real problem in practice (and we have many\nother places where this race already exists). Future patches will\nremove these unlikely races.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "4eef3049986e8397d5003916aed8cad6567a5e02", "tree": "5e36431986907b9fa728a6fbeb819a2738a64c82", "parents": [ "c1768268f9424410761da57ea71107acae7b03cc" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:18 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: move per-queue blkg list heads and counters to queue and blkg\n\nCurrently, specific policy implementations are responsible for\nmaintaining list and number of blkgs. This duplicates code\nunnecessarily, and hinders factoring common code and providing blkcg\nAPI with better defined semantics.\n\nAfter this patch, request_queue hosts list heads and counters and blkg\nhas list nodes for both policies. This patch only relocates the\nnecessary fields and the next patch will actually move management code\ninto blkcg core.\n\nNote that request_queue-\u003eblkg_list[] and -\u003enr_blkgs[] are hardcoded to\nhave 2 elements. This is to avoid include dependency and will be\nremoved by the next patch.\n\nThis patch doesn\u0027t introduce any behavior change.\n\n-v2: Now unnecessary conditional on CONFIG_BLK_CGROUP_MODULE removed\n as pointed out by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "c1768268f9424410761da57ea71107acae7b03cc", "tree": "be6a534b1a15ab9df9f23e585b039776c5a5e498", "parents": [ "549d3aa872cd1aec1ee540fd93afd9611faa0def" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:17 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: don\u0027t use blkg-\u003eplid in stat related functions\n\nblkg is scheduled to be unified for all policies and thus there won\u0027t\nbe one-to-one mapping from blkg to policy. Update stat related\nfunctions to take explicit @pol or @plid arguments and not use\nblkg-\u003eplid.\n\nThis is painful for now but most of specific stat interface functions\nwill be replaced with a handful of generic helpers.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "549d3aa872cd1aec1ee540fd93afd9611faa0def", "tree": "27c3703d3448dc0be9f58b5f01224ae901422a32", "parents": [ "1adaf3dde37a8b9b59ea59c5f58fed7761178383" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:16 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: make blkg-\u003epd an array and move configuration and stats into it\n\nTo prepare for unifying blkgs for different policies, make blkg-\u003epd an\narray with BLKIO_NR_POLICIES elements and move blkg-\u003econf, -\u003estats,\nand -\u003estats_cpu into blkg_policy_data.\n\nThis patch doesn\u0027t introduce any functional difference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "1adaf3dde37a8b9b59ea59c5f58fed7761178383", "tree": "e4a46485b1bf0370aa41a5b9a8f138fba34c9d23", "parents": [ "0381411e4b1a52cee134eb73750e5e3cc1155d09" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:15 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: move refcnt to blkcg core\n\nCurrently, blkcg policy implementations manage blkg refcnt duplicating\nmostly identical code in both policies. This patch moves refcnt to\nblkg and let blkcg core handle refcnt and freeing of blkgs.\n\n* cfq blkgs now also get freed via RCU.\n\n* cfq blkgs lose RB_EMPTY_ROOT() sanity check on blkg free. If\n necessary, we can add blkio_exit_group_fn() to resurrect this.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0381411e4b1a52cee134eb73750e5e3cc1155d09", "tree": "32aa1d0b8a2ca8277e60e8b78dd731d193440924", "parents": [ "923adde1be1df57cebd80c563058e503376645e8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:14 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: let blkcg core handle policy private data allocation\n\nCurrently, blkg\u0027s are embedded in private data blkcg policy private\ndata structure and thus allocated and freed by policies. This leads\nto duplicate codes in policies, hinders implementing common part in\nblkcg core with strong semantics, and forces duplicate blkg\u0027s for the\nsame cgroup-q association.\n\nThis patch introduces struct blkg_policy_data which is a separate data\nstructure chained from blkg. Policies specifies the amount of private\ndata it needs in its blkio_policy_type-\u003epdata_size and blkcg core\ntakes care of allocating them along with blkg which can be accessed\nusing blkg_to_pdata(). blkg can be determined from pdata using\npdata_to_blkg(). blkio_alloc_group_fn() method is accordingly updated\nto blkio_init_group_fn().\n\nFor consistency, tg_of_blkg() and cfqg_of_blkg() are replaced with\nblkg_to_tg() and blkg_to_cfqg() respectively, and functions to map in\nthe reverse direction are added.\n\nExcept that policy specific data now lives in a separate data\nstructure from blkg, this patch doesn\u0027t introduce any functional\ndifference.\n\nThis will be used to unify blkg\u0027s for different policies.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "923adde1be1df57cebd80c563058e503376645e8", "tree": "7009edf644abdf6b91daaab3967ffa6a8b30633a", "parents": [ "5efd611351d1a847c72d74fb12ff4bd187c0cb2c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:13 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: clear all request_queues on blkcg policy [un]registrations\n\nKeep track of all request_queues which have blkcg initialized and turn\non bypass and invoke blkcg_clear_queue() on all before making changes\nto blkcg policies.\n\nThis is to prepare for moving blkg management into blkcg core. Note\nthat this uses more brute force than necessary. Finer grained shoot\ndown will be implemented later and given that policy [un]registration\nalmost never happens on running systems (blk-throtl can\u0027t be built as\na module and cfq usually is the builtin default iosched), this\nshouldn\u0027t be a problem for the time being.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "5efd611351d1a847c72d74fb12ff4bd187c0cb2c", "tree": "bac28206d088426ab872eea98155cc100bd8d9b1", "parents": [ "7ee9c5620504906e98451dc9a1945b2b9e892cb8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:12 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: add blkcg_{init|drain|exit}_queue()\n\nCurrently block core calls directly into blk-throttle for init, drain\nand exit. This patch adds blkcg_{init|drain|exit}_queue() which wraps\nthe blk-throttle functions. This is to give more control and\nvisiblity to blkcg core layer for proper layering. Further patches\nwill add logic common to blkcg policies to the functions.\n\nWhile at it, collapse blk_throtl_release() into blk_throtl_exit().\nThere\u0027s no reason to keep them separate.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "7ee9c5620504906e98451dc9a1945b2b9e892cb8", "tree": "1daf4d9fc8d03ebbc88ceedb7abeec46d8c71df3", "parents": [ "92616b5b3a7c7fa8148df82e7ff6183056f2bfc8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:11 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:23 2012 +0100" }, "message": "blkcg: let blkio_group point to blkio_cgroup directly\n\nCurrently, blkg points to the associated blkcg via its css_id. This\nunnecessarily complicates dereferencing blkcg. Let blkg hold a\nreference to the associated blkcg and point directly to it and disable\ncss_id on blkio_subsys.\n\nThis change requires splitting blkiocg_destroy() into\nblkiocg_pre_destroy() and blkiocg_destroy() so that all blkg\u0027s can be\ndestroyed and all the blkcg references held by them dropped during\ncgroup removal.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "92616b5b3a7c7fa8148df82e7ff6183056f2bfc8", "tree": "b204b7df4753e9508cf15d278688dc9c307761fa", "parents": [ "7a4dd281ec66224f802093962d1d903d86b09560" ], "author": { "name": "Vivek Goyal", "email": "vgoyal@redhat.com", "time": "Mon Mar 05 13:15:10 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: skip blkg printing if q isn\u0027t associated with disk\n\nblk-cgroup printing code currently assumes that there is a device/disk\nassociated with every queue in the system, but modules like floppy,\ncan instantiate request queues without registering disk which can lead\nto oops.\n\nSkip the queue/blkg which don\u0027t have dev/disk associated with them.\n\n-tj: Factored out backing_dev_info check into blkg_dev_name().\n\nSigned-off-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "7a4dd281ec66224f802093962d1d903d86b09560", "tree": "c38c5c40464d4d7eb429cc14348a435176832ef2", "parents": [ "4bfd482e73b30284cb21e10834ce729fa81aa256" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:09 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: kill the mind-bending blkg-\u003edev\n\nblkg-\u003edev is dev_t recording the device number of the block device for\nthe associated request_queue. It is used to identify the associated\nblock device when printing out configuration or stats.\n\nThis is redundant to begin with. A blkg is an association between a\ncgroup and a request_queue and it of course is possible to reach\nrequest_queue from blkg and synchronization conventions are in place\nfor safe q dereferencing, so this shouldn\u0027t be necessary from the\nbeginning. Furthermore, it\u0027s initialized by sscanf()ing the device\nname of backing_dev_info. The mind boggles.\n\nAnyways, if blkg is visible under rcu lock, we *know* that the\nassociated request_queue hasn\u0027t gone away yet and its bdi is\nregistered and alive - blkg can\u0027t be created for request_queue which\nhasn\u0027t been fully initialized and it can\u0027t go away before blkg is\nremoved.\n\nLet stat and conf read functions get device name from\nblkg-\u003eq-\u003ebacking_dev_info.dev and pass it down to printing functions\nand remove blkg-\u003edev.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "4bfd482e73b30284cb21e10834ce729fa81aa256", "tree": "2c39e09592113946e3545013199b0e00a21f60f2", "parents": [ "e56da7e287967667474a58c4f60c286279e3f487" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:08 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: kill blkio_policy_node\n\nNow that blkcg configuration lives in blkg\u0027s, blkio_policy_node is no\nlonger necessary. Kill it.\n\nblkio_policy_parse_and_set() now fails if invoked for missing device\nand functions to print out configurations are updated to print from\nblkg\u0027s.\n\ncftype_blkg_same_policy() is dropped along with other policy functions\nfor consistency. Its one line is open coded in the only user -\nblkio_read_blkg_stats().\n\n-v2: Update to reflect the retry-on-bypass logic change of the\n previous patch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "e56da7e287967667474a58c4f60c286279e3f487", "tree": "4ce64581888f287a25b4abdc21fc641210351612", "parents": [ "cd1604fab4f95f7cfc227d3955fd7ae14da61f38" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:07 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: don\u0027t allow or retain configuration of missing devices\n\nblkcg is very peculiar in that it allows setting and remembering\nconfigurations for non-existent devices by maintaining separate data\nstructures for configuration.\n\nThis behavior is completely out of the usual norms and outright\nconfusing; furthermore, it uses dev_t number to match the\nconfiguration to devices, which is unpredictable to begin with and\nbecomes completely unuseable if EXT_DEVT is fully used.\n\nIt is wholely unnecessary - we already have fully functional userland\nmechanism to program devices being hotplugged which has full access to\ndevice identification, connection topology and filesystem information.\n\nAdd a new struct blkio_group_conf which contains all blkcg\nconfigurations to blkio_group and let blkio_group, which can be\ncreated iff the associated device exists and is removed when the\nassociated device goes away, carry all configurations.\n\nNote that, after this patch, all newly created blkg\u0027s will always have\nthe default configuration (unlimited for throttling and blkcg\u0027s weight\nfor propio).\n\nThis patch makes blkio_policy_node meaningless but doesn\u0027t remove it.\nThe next patch will.\n\n-v2: Updated to retry after short sleep if blkg lookup/creation failed\n due to the queue being temporarily bypassed as indicated by\n -EBUSY return. Pointed out by Vivek.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "cd1604fab4f95f7cfc227d3955fd7ae14da61f38", "tree": "021881faedc1c2468730f9f54d364083e70dce76", "parents": [ "f51b802c17e2a21926b29911493f5e7ddf6eee87" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:06 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: factor out blkio_group creation\n\nCurrently both blk-throttle and cfq-iosched implement their own\nblkio_group creation code in throtl_get_tg() and cfq_get_cfqg(). This\npatch factors out the common code into blkg_lookup_create(), which\nreturns ERR_PTR value so that transitional failures due to queue\nbypass can be distinguished from other failures.\n\n* New plkio_policy_ops methods blkio_alloc_group_fn() and\n blkio_link_group_fn added. Both are transitional and will be\n removed once the blkg management code is fully moved into\n blk-cgroup.c.\n\n* blkio_alloc_group_fn() allocates policy-specific blkg which is\n usually a larger data structure with blkg as the first entry and\n intiailizes it. Note that initialization of blkg proper, including\n percpu stats, is responsibility of blk-cgroup proper.\n\n Note that default config (weight, bps...) initialization is done\n from this method; otherwise, we end up violating locking order\n between blkcg and q locks via blkcg_get_CONF() functions.\n\n* blkio_link_group_fn() is called under queue_lock and responsible for\n linking the blkg to the queue. blkcg side is handled by blk-cgroup\n proper.\n\n* The common blkg creation function is named blkg_lookup_create() and\n blkiocg_lookup_group() is renamed to blkg_lookup() for consistency.\n Also, throtl / cfq related functions are similarly [re]named for\n consistency.\n\nThis simplifies blkcg policy implementations and enables further\ncleanup.\n\n-v2: Vivek noticed that blkg_lookup_create() incorrectly tested\n blk_queue_dead() instead of blk_queue_bypass() leading a user of\n the function ending up creating a new blkg on bypassing queue.\n This is a bug introduced while relocating bypass patches before\n this one. Fixed.\n\n-v3: ERR_PTR patch folded into this one. @for_root added to\n blkg_lookup_create() to allow creating root group on a bypassed\n queue during elevator switch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "f51b802c17e2a21926b29911493f5e7ddf6eee87", "tree": "c32d9ea2a61201b0c6bf59b349300af04dbc3686", "parents": [ "035d10b2fa7e5f7e9bf9465dbc39c35affd5ac32" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:05 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: use the usual get blkg path for root blkio_group\n\nFor root blkg, blk_throtl_init() was using throtl_alloc_tg()\nexplicitly and cfq_init_queue() was manually initializing embedded\ncfqd-\u003eroot_group, adding unnecessarily different code paths to blkg\nhandling.\n\nMake both use the usual blkio_group get functions - throtl_get_tg()\nand cfq_get_cfqg() - for the root blkio_group too. Note that\nblk_throtl_init() callsite is pushed downwards in\nblk_alloc_queue_node() so that @q is sufficiently initialized for\nthrotl_get_tg().\n\nThis simplifies root blkg handling noticeably for cfq and will allow\nfurther modularization of blkcg API.\n\n-v2: Vivek pointed out that using cfq_get_cfqg() won\u0027t work if\n CONFIG_CFQ_GROUP_IOSCHED is disabled. Fix it by factoring out\n initialization of base part of cfqg into cfq_init_cfqg_base() and\n alloc/init/free explicitly if !CONFIG_CFQ_GROUP_IOSCHED.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "035d10b2fa7e5f7e9bf9465dbc39c35affd5ac32", "tree": "6a712eb1b505e8163d28f8709980e581a08b572c", "parents": [ "ca32aefc7f2539ed88d42763330d54ee3e61769a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:04 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: add blkio_policy[] array and allow one policy per policy ID\n\nBlock cgroup policies are maintained in a linked list and,\ntheoretically, multiple policies sharing the same policy ID are\nallowed.\n\nThis patch temporarily restricts one policy per plid and adds\nblkio_policy[] array which indexes registered policy types by plid.\nBoth the restriction and blkio_policy[] array are transitional and\nwill be removed once API cleanup is complete.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "ca32aefc7f2539ed88d42763330d54ee3e61769a", "tree": "791d2ac1c11b738ce34629653090b6e971fc11b5", "parents": [ "0a5a7d0e32be6643b881f0e7cd9d0d06fadde27a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:03 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: use q and plid instead of opaque void * for blkio_group association\n\nblkgio_group is association between a block cgroup and a queue for a\ngiven policy. Using opaque void * for association makes things\nconfusing and hinders factoring of common code. Use request_queue *\nand, if necessary, policy id instead.\n\nThis will help block cgroup API cleanup.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "0a5a7d0e32be6643b881f0e7cd9d0d06fadde27a", "tree": "271f62b5f75c239831c7def1c445a6e990366730", "parents": [ "2a7f124414b35645049e9c1b125a6f0b470aa5ae" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:02 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:22 2012 +0100" }, "message": "blkcg: update blkg get functions take blkio_cgroup as parameter\n\nIn both blkg get functions - throtl_get_tg() and cfq_get_cfqg(),\ninstead of obtaining blkcg of %current explicitly, let the caller\nspecify the blkcg to use as parameter and make both functions hold on\nto the blkcg.\n\nThis is part of block cgroup interface cleanup and will help making\nblkcg API more modular.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" } ], "next": "2a7f124414b35645049e9c1b125a6f0b470aa5ae" }