From patchwork Thu Jul 15 21:27:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian May X-Patchwork-Id: 1505912 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=e57mnVrs; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GQnXW0408z9sWq; Fri, 16 Jul 2021 07:27:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m48ta-0003M4-8a; Thu, 15 Jul 2021 21:27:50 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-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 1m48tX-0003Lx-8w for kernel-team@lists.ubuntu.com; Thu, 15 Jul 2021 21:27:47 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.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-canonical-0.canonical.com (Postfix) with ESMTPS id 228C5408B5 for ; Thu, 15 Jul 2021 21:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626384467; bh=v+qOzgJH/yAFgrsYy1B7ez728tRlRvgs9c8vud0FtKk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=e57mnVrsO3dXrEEf1XczJznr7az+nsYDXZWm/Baw+RJZxtJTwYlwL2IO8BJAxKjX3 fayJTdjXdiAmtOsCHNmYooGE6tUW0Sdd3z8TmM8Eqv/lu25XLvsWPPBsMGpGK4RB3V oLwCIRNOBV99waDoIUeuRz/S0ymBjSbfJlP8oSJYN8DR6BUM+CNCAagkR8UGI079Js +PXtVtSZh4frWthVmbtpEBTA2edBxAde7ECy7tmKL7IUg1a2ROFb2IUM3XS/MJk8Lp rQ/xn6ngZLpeRe60aBw1zp1ZkVawnm1Xm2F7cxr6gnnWwe0TVLYpFnKCUKO3HNTi+k J/ruY0Ffcaa3Q== Received: by mail-ed1-f70.google.com with SMTP id n6-20020aa7c4460000b02903a12bbba1ebso3810947edr.6 for ; Thu, 15 Jul 2021 14:27:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=v+qOzgJH/yAFgrsYy1B7ez728tRlRvgs9c8vud0FtKk=; b=pAm9zqIJL25xP+RbNpLYgNelPjSgJHc9odr1oaR0b41qxD+sujWefpr3Ill7sa3S6X QgSRjcOkDuBLKBskQyVpeGVw/vf0+QHmerKS60XssiblWFieZ/kaxAa/03dCLDBMCMxi ut4rzDYBhZa3dhwO1NtTqHtyHHHseMNXk3TueYg6MNB/FxhEL7CXHPiwJAMTNWn7Hx60 HvBVqPYJ3OJ9h9LpwOKKwnuguHRRAbv6ltLiWI+UWFM24jumJTSBikUYJ7PZWviIUind 1TAvcGJC4QiDB/uicOJKi3iRpz53abrnx9/xDCUn8p/dJV94fhy/B/Ivgxo7dSx+wRvA U+3w== X-Gm-Message-State: AOAM5317GTAWKnJ574NWHNcaxXWWzOg/AIrirniasl+/hyxRZFnLeXS6 PtsXEnUw1A0+Hpp0kettcYLt7CKrrxkUTSXsnuL9GGmSKTSW+xl0rqkVPWV+z+jBoN0rm9TZvmc zROPYhlgah+dVD2os1UnOGxCN/vE6a8Bey3ba+f5hrA== X-Received: by 2002:a17:907:214c:: with SMTP id rk12mr7640252ejb.70.1626384466832; Thu, 15 Jul 2021 14:27:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw087M25rbaRZoRF+7KugxAK44IeJK6pSH4uGPs+AfHRzfJbkHBP8jlsF2wDC/216nHKP94g== X-Received: by 2002:a17:907:214c:: with SMTP id rk12mr7640239ejb.70.1626384466623; Thu, 15 Jul 2021 14:27:46 -0700 (PDT) Received: from uws.buildd ([2001:67c:1562:8007::aac:44bb]) by smtp.gmail.com with ESMTPSA id x13sm556186edv.40.2021.07.15.14.27.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 14:27:46 -0700 (PDT) From: Ian May To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH] UBUNTU: SAUCE: aio_dio_bugs: Fix O_DIRECT define Date: Thu, 15 Jul 2021 16:27:40 -0500 Message-Id: <20210715212740.3556875-1-ian.may@canonical.com> X-Mailer: git-send-email 2.25.1 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" BugLink: https://bugs.launchpad.net/bugs/1900791 If O_DIRECT is not defined in there is a manual definition specified for O_DIRECT, but it is the wrong value. define O_DIRECT 040000 /* direct disk access hint */ This value maps to O_DIRECTORY, hence the failure errno=20(ENOTDIR) strace also confirms the incorrect flag openat(AT_FDCWD, "file", O_RDWR|O_CREAT|O_TRUNC|O_DIRECTORY, 0600) The fix is to set the correct value for O_DIRECT Confirmed behavior with strace and that affected tests pass. openat(AT_FDCWD, "file", O_RDWR|O_CREAT|O_TRUNC|O_DIRECT, 0600) Signed-off-by: Ian May --- aio_dio_bugs/src/aio-dio-extend-stat.c | 2 +- aio_dio_bugs/src/aio-dio-invalidate-failure.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aio_dio_bugs/src/aio-dio-extend-stat.c b/aio_dio_bugs/src/aio-dio-extend-stat.c index e0dd2dfa..04e6225d 100644 --- a/aio_dio_bugs/src/aio-dio-extend-stat.c +++ b/aio_dio_bugs/src/aio-dio-extend-stat.c @@ -11,7 +11,7 @@ #include #ifndef O_DIRECT -#define O_DIRECT 040000 /* direct disk access hint */ +#define O_DIRECT 0200000 /* direct disk access hint */ #endif diff --git a/aio_dio_bugs/src/aio-dio-invalidate-failure.c b/aio_dio_bugs/src/aio-dio-invalidate-failure.c index c5ffff05..11bd7c2d 100644 --- a/aio_dio_bugs/src/aio-dio-invalidate-failure.c +++ b/aio_dio_bugs/src/aio-dio-invalidate-failure.c @@ -26,7 +26,7 @@ * return -EIO. */ #ifndef O_DIRECT -#define O_DIRECT 040000 /* direct disk access hint */ +#define O_DIRECT 0200000 /* direct disk access hint */ #endif #define GINORMOUS (32 * 1024 * 1024)