From 2af2346bced741dc0befde4cb7700e4aeb55517e Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Tue, 24 Sep 2019 14:00:30 +0800 Subject: fio: upgrade 3.15 -> 3.16 -files/0001-engines-splice-remove-buggy-mem_align-set.patch Removed since this is included in 3.16. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- ...engines-splice-remove-buggy-mem_align-set.patch | 43 -------------------- meta-oe/recipes-benchmark/fio/fio_3.15.bb | 46 ---------------------- meta-oe/recipes-benchmark/fio/fio_3.16.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 89 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch delete mode 100644 meta-oe/recipes-benchmark/fio/fio_3.15.bb create mode 100644 meta-oe/recipes-benchmark/fio/fio_3.16.bb diff --git a/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch b/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch deleted file mode 100644 index cb18032d24..0000000000 --- a/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Sat, 3 Aug 2019 08:33:24 -0600 -Subject: [PATCH] engines/splice: remove buggy ->mem_align set - -Two things wrong here: - -1) We align buffers by default, so no need for splice to do anything - extra. -2) ->mem_align is not a true/false setting, it's the alignment itself. - Hence the current setting to 1 is just buggy. - -Upstream-Status: Backport [https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc] - -Fixes: https://github.com/axboe/fio/issues/810 -Reported-by: Sitsofe Wheeler -Signed-off-by: Jens Axboe -Signed-off-by: Liwei Song ---- - engines/splice.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/engines/splice.c b/engines/splice.c -index feb764feb2f4..6fc36bb6f154 100644 ---- a/engines/splice.c -+++ b/engines/splice.c -@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td) - */ - sd->vmsplice_to_user_map = 1; - -- /* -- * And if vmsplice_to_user works, we definitely need aligned -- * buffers. Just set ->odirect to force that. -- */ -- if (td_read(td)) -- td->o.mem_align = 1; -- - td->io_ops_data = sd; - return 0; - } --- -2.22.0 - diff --git a/meta-oe/recipes-benchmark/fio/fio_3.15.bb b/meta-oe/recipes-benchmark/fio/fio_3.15.bb deleted file mode 100644 index df81759dab..0000000000 --- a/meta-oe/recipes-benchmark/fio/fio_3.15.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Filesystem and hardware benchmark and stress tool" -DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ -stress/hardware verification. It has support for a number of I/O engines, \ -I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ -and much more. It can work on block devices as well as files. fio accepts \ -job descriptions in a simple-to-understand text format. Several example job \ -files are included. fio displays all sorts of I/O performance information." -HOMEPAGE = "http://freecode.com/projects/fio" -SECTION = "console/tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libaio zlib" -RDEPENDS_${PN} = "python bash" - -PACKAGECONFIG_NUMA = "numa" -# ARM does not currently support NUMA -PACKAGECONFIG_NUMA_arm = "" -PACKAGECONFIG_NUMA_armeb = "" - -PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" -PACKAGECONFIG[numa] = ",--disable-numa,numactl" - -SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f" -SRC_URI = "git://git.kernel.dk/fio.git \ - file://0001-update-the-interpreter-paths.patch \ - file://0001-engines-splice-remove-buggy-mem_align-set.patch \ -" - -S = "${WORKDIR}/git" - -# avoids build breaks when using no-static-libs.inc -DISABLE_STATIC = "" - -EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} - install -d ${D}/${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ -} diff --git a/meta-oe/recipes-benchmark/fio/fio_3.16.bb b/meta-oe/recipes-benchmark/fio/fio_3.16.bb new file mode 100644 index 0000000000..092b2bead0 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio_3.16.bb @@ -0,0 +1,45 @@ +SUMMARY = "Filesystem and hardware benchmark and stress tool" +DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ +stress/hardware verification. It has support for a number of I/O engines, \ +I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ +and much more. It can work on block devices as well as files. fio accepts \ +job descriptions in a simple-to-understand text format. Several example job \ +files are included. fio displays all sorts of I/O performance information." +HOMEPAGE = "http://freecode.com/projects/fio" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libaio zlib" +RDEPENDS_${PN} = "python bash" + +PACKAGECONFIG_NUMA = "numa" +# ARM does not currently support NUMA +PACKAGECONFIG_NUMA_arm = "" +PACKAGECONFIG_NUMA_armeb = "" + +PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" +PACKAGECONFIG[numa] = ",--disable-numa,numactl" + +SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d" +SRC_URI = "git://git.kernel.dk/fio.git \ + file://0001-update-the-interpreter-paths.patch \ +" + +S = "${WORKDIR}/git" + +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} + install -d ${D}/${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ +} -- cgit 1.2.3-korg