From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andreas Herrmann <aherrmann@suse.com>,
Jens Axboe <axboe@kernel.dk>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Subject: Re: linux-next: manual merge of the cgroup tree with Linus' tree
Date: Tue, 9 Jul 2019 09:25:07 +1000 [thread overview]
Message-ID: <20190709092507.67e13031@canb.auug.org.au> (raw)
In-Reply-To: <20190617160635.30927c7a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3931 bytes --]
Hi all,
On Mon, 17 Jun 2019 16:06:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the cgroup tree got a conflict in:
>
> Documentation/cgroup-v1/blkio-controller.rst
>
> between commit:
>
> fb5772cbfe48 ("blkio-controller.txt: Remove references to CFQ")
>
> from Linus' tree and commit:
>
> 99c8b231ae6c ("docs: cgroup-v1: convert docs to ReST and rename to *.rst")
>
> from the cgroup tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/cgroup-v1/blkio-controller.rst
> index d1a1b7bdd03a,2c1b907afc14..000000000000
> --- a/Documentation/cgroup-v1/blkio-controller.rst
> +++ b/Documentation/cgroup-v1/blkio-controller.rst
> @@@ -15,15 -19,71 +17,18 @@@ level logical devices like device mappe
>
> HOWTO
> =====
> -Proportional Weight division of bandwidth
> ------------------------------------------
> -You can do a very simple testing of running two dd threads in two different
> -cgroups. Here is what you can do.
> -
> -- Enable Block IO controller::
> -
> - CONFIG_BLK_CGROUP=y
> -
> -- Enable group scheduling in CFQ:
> -
> -
> - CONFIG_CFQ_GROUP_IOSCHED=y
> -
> -- Compile and boot into kernel and mount IO controller (blkio); see
> - cgroups.txt, Why are cgroups needed?.
> -
> - ::
> -
> - mount -t tmpfs cgroup_root /sys/fs/cgroup
> - mkdir /sys/fs/cgroup/blkio
> - mount -t cgroup -o blkio none /sys/fs/cgroup/blkio
> -
> -- Create two cgroups::
> -
> - mkdir -p /sys/fs/cgroup/blkio/test1/ /sys/fs/cgroup/blkio/test2
> -
> -- Set weights of group test1 and test2::
> -
> - echo 1000 > /sys/fs/cgroup/blkio/test1/blkio.weight
> - echo 500 > /sys/fs/cgroup/blkio/test2/blkio.weight
> -
> -- Create two same size files (say 512MB each) on same disk (file1, file2) and
> - launch two dd threads in different cgroup to read those files::
> -
> - sync
> - echo 3 > /proc/sys/vm/drop_caches
> -
> - dd if=/mnt/sdb/zerofile1 of=/dev/null &
> - echo $! > /sys/fs/cgroup/blkio/test1/tasks
> - cat /sys/fs/cgroup/blkio/test1/tasks
> -
> - dd if=/mnt/sdb/zerofile2 of=/dev/null &
> - echo $! > /sys/fs/cgroup/blkio/test2/tasks
> - cat /sys/fs/cgroup/blkio/test2/tasks
> -
> -- At macro level, first dd should finish first. To get more precise data, keep
> - on looking at (with the help of script), at blkio.disk_time and
> - blkio.disk_sectors files of both test1 and test2 groups. This will tell how
> - much disk time (in milliseconds), each group got and how many sectors each
> - group dispatched to the disk. We provide fairness in terms of disk time, so
> - ideally io.disk_time of cgroups should be in proportion to the weight.
> -
> Throttling/Upper Limit policy
> -----------------------------
> - - Enable Block IO controller
> + - Enable Block IO controller::
> +
> CONFIG_BLK_CGROUP=y
>
> - - Enable throttling in block layer
> + - Enable throttling in block layer::
> +
> CONFIG_BLK_DEV_THROTTLING=y
>
> - - Mount blkio controller (see cgroups.txt, Why are cgroups needed?)
> + - Mount blkio controller (see cgroups.txt, Why are cgroups needed?)::
> +
> mount -t cgroup -o blkio none /sys/fs/cgroup/blkio
>
> - Specify a bandwidth rate on particular device for root group. The format
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-08 23:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 6:06 linux-next: manual merge of the cgroup tree with Linus' tree Stephen Rothwell
2019-07-08 23:25 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-07 6:36 Stephen Rothwell
2015-12-07 15:20 ` Tejun Heo
2015-12-07 20:19 ` Stephen Rothwell
2014-05-26 7:45 Stephen Rothwell
2013-03-14 2:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709092507.67e13031@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aherrmann@suse.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).