From patchwork Fri Jan 21 14:49:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1582610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=pBiPYYYK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgMjb72PMz9t56 for ; Sat, 22 Jan 2022 01:49:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nAvEZ-0003gN-Cb; Fri, 21 Jan 2022 14:49:47 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nAvEX-0003fq-07 for kernel-team@lists.ubuntu.com; Fri, 21 Jan 2022 14:49:45 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D5AB73F17B for ; Fri, 21 Jan 2022 14:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642776584; bh=+6zWcliQ7YtDLLevxoeFiw9C6C5oXrCV2YNcxCY+8qY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pBiPYYYK1FXBnQ47gCd03hgLX3Y0ESBKcsNeNu6y9HroP3sF6M+mMIihlZ+EEz9nt IlvXwK+HN31h6pZbsYiKOgC4yjuXgMezg3ZQ4POX5/hRC844IqOdo9hd2J/iYj4YiW iCglVv3HNlkKGE5Z2SRUkM86MhcSc9ev73m6aylmhLumxRz5/r6sFouE9IVIb4bsBT RVQntypW/kjjf1ndOlEQPxzPEv/iTiBpdjEwZipqe+EAHz6UbPRSCcMDQDhAqJxW9e /D47vuF0q4OwxPffMciqHXILICC3VdRWAmh5C6Z3pHgNIwZrzL8tmuF9rxEMytSeYK O2JdV3FqQxICw== Received: by mail-wm1-f70.google.com with SMTP id z2-20020a05600c220200b0034d2eb95f27so6450669wml.1 for ; Fri, 21 Jan 2022 06:49:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+6zWcliQ7YtDLLevxoeFiw9C6C5oXrCV2YNcxCY+8qY=; b=aNSJpfiJnJmDOrKQHIjMX2fyFyEcYhdK6QuIrgxbo3TgsXAxpKn1C5DefY+Her4nLT IFmVqDyzHufDvpkFpZr1/1cyFTRDUskP77/b3GMJcXLIyf2bU4s8T4VZRNZ3+EHYrKk5 hWsVyuaCAgBm4LlSfh4zJkT6o6w1D1x5hbk8Vnx1fCc3GvxYZBa/FXq+mYVgKFGayNv9 7030I4GQBWmgWIX6cbPcLBi3i2AVxcjXjQ8cgmJIxV5/qa5yPsDSAUDEvQhQdxZjnD10 iGvGDL09c6hSjjff4S6OJ3TdUF9HHMC/SYocxy6A7XRUt1FF1kNPDGe0cDvKJwpZiEZn bI4Q== X-Gm-Message-State: AOAM5313w5KtKlKG8MCAj6AGGrTZ7Qt41PEuBw+4M3H1B+KcVrzb+RRw 8Gs0NdxUyxRwqBxAch5jk2SQ72QLafIztikbzk58c2DxQFgEniooLcOWD+yhoU8UeyLi96wdCl5 A+bsoDXhjHE1J0oebYWbXrDg7URlQaZKv6pkv7MkCoA== X-Received: by 2002:adf:f94a:: with SMTP id q10mr4109248wrr.263.1642776584241; Fri, 21 Jan 2022 06:49:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyx2zhjp64WRM3Xs14NjWJuF4yRCvUpnRkoUia/xP3xyzcj1AgHh+V/aHOPz5L6JnENNU1zWg== X-Received: by 2002:adf:f94a:: with SMTP id q10mr4109225wrr.263.1642776583834; Fri, 21 Jan 2022 06:49:43 -0800 (PST) Received: from localhost ([2a01:4b00:85fd:d700:dd88:fd2a:357f:f99e]) by smtp.gmail.com with ESMTPSA id v5sm7485293wrx.114.2022.01.21.06.49.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 06:49:43 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH 1/2] ubuntu_zfs_xfs_generic: Cherrypick build fix for 5.15 kernels Date: Fri, 21 Jan 2022 14:49:38 +0000 Message-Id: <20220121144939.2065081-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220121144939.2065081-1-dimitri.ledkov@canonical.com> References: <20220121144939.2065081-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" ubuntu_zfs_xfs_generic uses old snapshots of xfs tests & fio repositories. v5.15 has dropped raw support, thus cherry-picking patch from more recent fio to unbreak the build. Overall xfs tests are pinned to a version from 2019. Separately, an upgrade to a more recent snapshot of tests is needed. Signed-off-by: Dimitri John Ledkov --- ...75557e632efb506836bc1709789e615c9094.patch | 118 ++++++++++++++++++ .../ubuntu_zfs_xfs_generic.py | 2 + 2 files changed, 120 insertions(+) create mode 100644 ubuntu_zfs_xfs_generic/382975557e632efb506836bc1709789e615c9094.patch diff --git a/ubuntu_zfs_xfs_generic/382975557e632efb506836bc1709789e615c9094.patch b/ubuntu_zfs_xfs_generic/382975557e632efb506836bc1709789e615c9094.patch new file mode 100644 index 0000000000..8f09a0394a --- /dev/null +++ b/ubuntu_zfs_xfs_generic/382975557e632efb506836bc1709789e615c9094.patch @@ -0,0 +1,118 @@ +From 382975557e632efb506836bc1709789e615c9094 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Tue, 3 Aug 2021 10:23:35 -0700 +Subject: fio: remove raw device support + +As of Linux kernel commit 603e4922f1c ("remove the raw driver"), +linux/raw.h is gone, and raw device support no longer exists. +Because of this, fio can no longer build against the current Linux +kernel headers. + +So, remove raw device support from fio as well. + +Signed-off-by: Eric Sandeen +Signed-off-by: Jens Axboe +--- + diskutil.c | 10 +++------- + fio.1 | 4 +--- + os/os-linux.h | 32 -------------------------------- + os/os.h | 4 ---- + 4 files changed, 4 insertions(+), 46 deletions(-) + +diff --git a/diskutil.c b/diskutil.c +index 0051a7a0..ace7af3d 100644 +--- a/diskutil.c ++++ b/diskutil.c +@@ -166,14 +166,10 @@ static int get_device_numbers(char *file_name, int *maj, int *min) + if (S_ISBLK(st.st_mode)) { + majdev = major(st.st_rdev); + mindev = minor(st.st_rdev); +- } else if (S_ISCHR(st.st_mode)) { +- majdev = major(st.st_rdev); +- mindev = minor(st.st_rdev); +- if (fio_lookup_raw(st.st_rdev, &majdev, &mindev)) +- return -1; +- } else if (S_ISFIFO(st.st_mode)) ++ } else if (S_ISCHR(st.st_mode) || ++ S_ISFIFO(st.st_mode)) { + return -1; +- else { ++ } else { + majdev = major(st.st_dev); + mindev = minor(st.st_dev); + } +diff --git a/os/os-linux.h b/os/os-linux.h +index f7137abe..16ed5258 100644 +--- a/os/os-linux.h ++++ b/os/os-linux.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -41,7 +40,6 @@ + #define FIO_HAVE_IOSCHED_SWITCH + #define FIO_HAVE_ODIRECT + #define FIO_HAVE_HUGETLB +-#define FIO_HAVE_RAWBIND + #define FIO_HAVE_BLKTRACE + #define FIO_HAVE_CL_SIZE + #define FIO_HAVE_CGROUPS +@@ -178,36 +176,6 @@ static inline unsigned long long os_phys_mem(void) + return (unsigned long long) pages * (unsigned long long) pagesize; + } + +-static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev) +-{ +- struct raw_config_request rq; +- int fd; +- +- if (major(dev) != RAW_MAJOR) +- return 1; +- +- /* +- * we should be able to find /dev/rawctl or /dev/raw/rawctl +- */ +- fd = open("/dev/rawctl", O_RDONLY); +- if (fd < 0) { +- fd = open("/dev/raw/rawctl", O_RDONLY); +- if (fd < 0) +- return 1; +- } +- +- rq.raw_minor = minor(dev); +- if (ioctl(fd, RAW_GETBIND, &rq) < 0) { +- close(fd); +- return 1; +- } +- +- close(fd); +- *majdev = rq.block_major; +- *mindev = rq.block_minor; +- return 0; +-} +- + #ifdef O_NOATIME + #define FIO_O_NOATIME O_NOATIME + #else +diff --git a/os/os.h b/os/os.h +index e47d3d97..17daf91d 100644 +--- a/os/os.h ++++ b/os/os.h +@@ -157,10 +157,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); + #define OS_RAND_MAX RAND_MAX + #endif + +-#ifndef FIO_HAVE_RAWBIND +-#define fio_lookup_raw(dev, majdev, mindev) 1 +-#endif +- + #ifndef FIO_PREFERRED_ENGINE + #define FIO_PREFERRED_ENGINE "psync" + #endif +-- +cgit v1.2.3 + diff --git a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py index 6fc0d2ee76..f2224ce40b 100644 --- a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py +++ b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py @@ -107,6 +107,8 @@ class ubuntu_zfs_xfs_generic(test.test): os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'fio')) print("Patching fio: fix linker issues with modern gcc") utils.system('patch -p1 < %s/0008-Fix-linker-issues-by-making-tsc_reliable-a-weak-refe.patch' % self.bindir) + print("Patch out raw support") + utils.system('patch -p1 < %s/382975557e632efb506836bc1709789e615c9094.patch' % self.bindir) # os.chdir(os.path.join(self.srcdir, 'xfstests-bld')) # print("getting xfs tests source") From patchwork Fri Jan 21 14:49:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1582612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=o29uvz+r; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgMjb56pyz9t2p for ; Sat, 22 Jan 2022 01:49:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nAvEZ-0003gZ-Jw; Fri, 21 Jan 2022 14:49:47 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nAvEY-0003gB-8l for kernel-team@lists.ubuntu.com; Fri, 21 Jan 2022 14:49:46 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1C8C23F17B for ; Fri, 21 Jan 2022 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642776586; bh=5U37mdlFZas8LIRkeiolTeR60wMKU4Ez5d00hQ54x5c=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o29uvz+rGwUscpOEQHA2N6JJStnljlM4y/0oVVrsSxJa3rbNrHuaaYOqCoi1mMPhF MyE6aqH7tHhcmBGrIGDfBxwsVASAJjGM9StGslxUzXzM3Aym74JVUl50Sq4rZF8w2O qcvNUzXt584wa2VpEtc1fPy9P2ypFYcZaWq3nMWO55DLysYzCz8CRSmqOrc+Bspcm2 +pfG7LyincIG+kPvbbD3ISDjziW7aHh8e+xrhmzxZFHp1gZWGs9fGTpB6YS3Hh4KQQ zt8ukHeqELgpu9tWuVUaRVFl7n4swYdFh/TMvo6483GDlA0swqSjtgracD1SUQT4Oi It6J0sic2T5MQ== Received: by mail-wm1-f72.google.com with SMTP id f187-20020a1c38c4000000b0034d5c66d8f5so7346565wma.5 for ; Fri, 21 Jan 2022 06:49:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5U37mdlFZas8LIRkeiolTeR60wMKU4Ez5d00hQ54x5c=; b=K0B5/uPc3r5AT4xWMNF8Nz3yOJemzVRqN5yqre1SorAyDS3ebvVDhvzOgJ1cM3qoDe Brpa/nNr1rwto2R/BocDxihR6EQBlsS2h59lqKV9omc7qBfAKUrbvbAvNMH1n1OdQsKp E15aZBuulttwAxSa4Ct9BydPSq90KfKaHl+l0bUGG5hUH/6ag6Lvjxqc/WhiIjB80+1A nzHbM6L6vlVGnpw0dJQyHRdOo6L1OdUQLau4a0j/wW0f9sNYb0i24v4CZ82cLiKRPnGb cWT2A+czKNWCxPkO/JBjru7r2laJJFotvQVef4++nFek3djqLJKyemMdgwsFoenavkUu I8mw== X-Gm-Message-State: AOAM531mVhv1uM8tCaiM4KmaRRCGwkPtUq9sdg52FyfSRn916pXof8fx ombqo3YmVMbFac+R2K87MWfiQQKMxvCKzTWYMR9k2PddCVhNAaRdPWmFRsDqpdB5zvsd0eVvgT3 p8aTpB9qNMuZkZgYC3lOkj+hJPHQTAowWD193UwYZ4w== X-Received: by 2002:a1c:256:: with SMTP id 83mr1019764wmc.89.1642776585557; Fri, 21 Jan 2022 06:49:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+8xgQvBnmMZBQlroMVYdrjwSS7g2cHghOKHRjhXvcSW45DllYfXwVW8tdT9x7N19eTNAAMQ== X-Received: by 2002:a1c:256:: with SMTP id 83mr1019752wmc.89.1642776585330; Fri, 21 Jan 2022 06:49:45 -0800 (PST) Received: from localhost ([2a01:4b00:85fd:d700:dd88:fd2a:357f:f99e]) by smtp.gmail.com with ESMTPSA id k18sm6733365wms.14.2022.01.21.06.49.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 06:49:45 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH 2/2] ubuntu_zfs_xfs_generic: Fix build by running autoreconf Date: Fri, 21 Jan 2022 14:49:39 +0000 Message-Id: <20220121144939.2065081-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220121144939.2065081-1-dimitri.ledkov@canonical.com> References: <20220121144939.2065081-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The build of unit tests are failing because somehow autoconfigury things are missing. Running autoreconf fixes the build. It is already installed as a dependency. Signed-off-by: Dimitri John Ledkov --- ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py index f2224ce40b..f5ede8b89f 100644 --- a/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py +++ b/ubuntu_zfs_xfs_generic/ubuntu_zfs_xfs_generic.py @@ -99,6 +99,8 @@ class ubuntu_zfs_xfs_generic(test.test): utils.system('patch -p1 < %s/0001-xfstests-add-minimal-support-for-zfs.patch' % self.bindir) print("Patching xfstests-dev: fix warning with Awk 5.0.1") utils.system('patch -p1 < %s/0006-generic-001-remove-unnecessary-backslash.patch' % self.bindir) + print("Running autoreconf --install") + utils.system('autoreconf --install') os.chdir(os.path.join(self.srcdir, 'xfstests-bld', 'xfsprogs-dev')) print("Patching xfstests-dev: fix linker issues with modern gcc")