From nobody Thu Oct 9 04:50:04 2025 Received: from mail-ot1-f99.google.com (mail-ot1-f99.google.com [209.85.210.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 681EA221F2D for ; Thu, 19 Jun 2025 19:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361280; cv=none; b=V+2vxyaXmfzUbEW/rcrqmj5sK66tNb7qpnwoIbLNsVRX6omQ6jqEay3i5Ln8t8RQQhU/E33srIP3S7gGiio6jICAxpiIqeYvW0+C3zK3UV1/f20uD7s9NZrYwkoSFiS0TMjqXahYg0VVKi0RtaSVkVdn94U/5YZRTJp/+HiGrgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361280; c=relaxed/simple; bh=K4VZVi3xDLWT0DEl3LNGUBjrD17+mi5NFECXhkIiWrY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gtsCWwM3pY1lfr83RC5sfzBxcG5Hd87v43wYkN6VlDIwJMyoUr18qPNtiMuJLPGRP8IU9Dylbmn7qLbMVKC0WeQjgLk930s/6bZvwcHyu8/DYAOdZ/vlPNu8b5orp1NSpshGPSe2uw8JkMU3pF0xD9QhiMTolU2N8lLNz6Q24Sk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=N0R2zRDu; arc=none smtp.client-ip=209.85.210.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="N0R2zRDu" Received: by mail-ot1-f99.google.com with SMTP id 46e09a7af769-735a5c85281so220101a34.1 for ; Thu, 19 Jun 2025 12:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1750361277; x=1750966077; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pd50J9nYsG0TeiIeJPqTSZq8OKqwb6u/EH2G1EHnbLs=; b=N0R2zRDuoRfzgfUiO1AcWFzICfQ3al3GoC94JDFHhiABvJd5154MlbhJm9MDthWHGU WiSAJGST5UQXcWz+uDSOquTk3dscvMlcMsMrgsMj/MS1xmir6HPpvlE0eoarK4ALIt66 jUQV8oDZkm2ThMXGcQJTY6EIw5rrZcLP0wVu1kDOku1p4miBTc41fbHQLI3XzMUhxG7J lvHoM0S4QjRz8CjJ9xxnDuLdu+3eNtczDXBMkSGNKsQDY1W/hLLLgX9fg3l7tM4QDyyW UXkPVeevwhCItJZNCfxPX/Y7zZOVH3WgczUz7MORJJKvxEqy7Jy6S4ynv76c53SBqYeF 6rsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750361277; x=1750966077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pd50J9nYsG0TeiIeJPqTSZq8OKqwb6u/EH2G1EHnbLs=; b=koQk7yllFPJ6C/WnSK8M+Tg/CJzLPmPLRFgp5fJ0HhMCe7jB9dBMZS8Sq3I3yg/m4r ujUvk8sWf5ooEruuV14BBSF2Pfx3GzU5jLsXfOlUbd7tGOI+2mYEjACkR/B3CmG/gbYX 9YZnc2mA6qhQs2cMBgEV4Vhcu+M/VY02Dyb2IsRHetD7qv/ve6nlgfYbY9i51hJXV4F0 zIKBb1v65mhi+1770BQklhzGq7n0BhjRsBhVv1Dq9ioijnwFnTawgAy5xSbJerSB3a7K 6u9TxFgG3kOV68FsIHDbipFf/Qvul8mtXWG+2wj7TP1/7xob0A3HHonDaZrnyi7jd1UM 59zQ== X-Forwarded-Encrypted: i=1; AJvYcCUirH4k9OHAcTBdv1knWlN8n7KJ32797wChcHHtYI/uWJDi5Q6WroWQ0eousZp7UK0Vsz07WOKuBB7oP9E=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9gjpew3p5ii+5zRsktybFfHsxVnYIzuvbmr1urp5QbBBavJp9 7aXj3+b0y/7is9/8n6DkhQXHxYMEDAOeAe15zBlGv8m6nuXg8RwkEeK6GVoSzlv4XLiQuIeSGIu 2xswhqCxkF92hVuJ9gwTxRwDqM/r9eGjnCFRW X-Gm-Gg: ASbGncspISsSuWSj0UWcGkjkXajs4f/vp29HQ9Resolpm0fcsJUxeQnqKBsOkFqC/Rk t2o0xEhHVRxi9PaNY86KbklzYjaHnKR03fQ1YGm0r0anbIa4PEUt8Ot9BCPVFS7LzWk+vFt/NBy sVrwHMD8ypyeEK5ZD4TYzj4UkXegffiE9+uDu6e4jmmtdSaSZJws6p2lcRU+YAdrQqkkr1o/vSk dZX7eLDhtEj5gN7jj9ouygkJ8vmSt14PYhBH6tJ7nNtes5efR/zYsWIIGp5kB09/4nl/miqfddE 3qq/Bv9YuiKKo9TnwIZVOj05P63/TcOU1ec1llMxtwuYin45isuz7F4= X-Google-Smtp-Source: AGHT+IFJTkxUOsR6hHqwhzCVU/31oTbq4J6u3JvNzvDfBfkf4G2km3lw6QOOl6Hu+u0klImFrFzJNZ4BngML X-Received: by 2002:a05:6871:205:b0:2ea:9842:68e2 with SMTP id 586e51a60fabf-2eeee56f4e5mr63594fac.10.1750361277182; Thu, 19 Jun 2025 12:27:57 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-2ee8a78e987sm17874fac.32.2025.06.19.12.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 12:27:57 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 34E5034031F; Thu, 19 Jun 2025 13:27:56 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 32ED7E4410B; Thu, 19 Jun 2025 13:27:56 -0600 (MDT) From: Caleb Sander Mateos To: Chris Mason , Josef Bacik , David Sterba , Jens Axboe Cc: Mark Harmstone , linux-btrfs@vger.kernel.org, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 1/4] btrfs/ioctl: don't skip accounting in early ENOTTY return Date: Thu, 19 Jun 2025 13:27:45 -0600 Message-ID: <20250619192748.3602122-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250619192748.3602122-1-csander@purestorage.com> References: <20250619192748.3602122-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" btrfs_uring_encoded_read() returns early with -ENOTTY if the uring_cmd is issued with IO_URING_F_COMPAT but the kernel doesn't support compat syscalls. However, this early return bypasses the syscall accounting. goto out_acct instead to ensure the syscall is counted. Signed-off-by: Caleb Sander Mateos Fixes: 34310c442e17 ("btrfs: add io_uring command for encoded reads (ENCODE= D_READ ioctl)") --- fs/btrfs/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 913acef3f0a9..ff15160e2581 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4827,11 +4827,12 @@ static int btrfs_uring_encoded_read(struct io_uring= _cmd *cmd, unsigned int issue =20 if (issue_flags & IO_URING_F_COMPAT) { #if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT) copy_end =3D offsetofend(struct btrfs_ioctl_encoded_io_args_32, flags); #else - return -ENOTTY; + ret =3D -ENOTTY; + goto out_acct; #endif } else { copy_end =3D copy_end_kernel; } =20 --=20 2.45.2 From nobody Thu Oct 9 04:50:04 2025 Received: from mail-qt1-f228.google.com (mail-qt1-f228.google.com [209.85.160.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F376B2451C8 for ; Thu, 19 Jun 2025 19:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361281; cv=none; b=XFVxJ2/dVJkO17Aim58Nigh+LDXMM70CYytzd2LLq87Z05M7yEsnW22C9lAzGsH+HR0CIdrqHnmiEBPm/47nJnAk2TnsHHZKTYWfRiyiuxUjDxVLHMkwKWHWsVbqhO9DCuyD5HGiB5WAYtHkvsVIYFZxxCvgkNqXTLG1oYPm4zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361281; c=relaxed/simple; bh=7hNsEhABE0MDxTWghxo/fSZvRqPJ7Q0SQ5s7b9NdLn8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dMX/tk3S6JZAt+asVhFW0GLCKxHTgLsPnHPwCARXD+MYxeydlZwaDyRJuUYo/Ql5S0Npgtu9etmQy7d0Fe7tNwH/0DrEULca/PcAdbqByVS4BwLWNKTeNc4Pya6f6UFelMFYH75pKCp/Wi2WNMFfZ6abHpHtkqFaFeZIoYVtEAg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=e2b/efYD; arc=none smtp.client-ip=209.85.160.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="e2b/efYD" Received: by mail-qt1-f228.google.com with SMTP id d75a77b69052e-47745b4b9aaso1211651cf.0 for ; Thu, 19 Jun 2025 12:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1750361278; x=1750966078; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sL/gnD+RoXyhkM+7is5bQz7YiFPCrbWYEFKrkuC7LHU=; b=e2b/efYDRBZyc9OlMjY3ceghHYSrNX2WOvBeiFN5gV0gBxeFRToOmbD5ufcp/d9/TV 9QahCsh0Fm1XJhyLYrj2por/u/V2lfbjtxw4Zp+0agUFCdn6Qffusmho0FBduO/5lyAN /UfsU5N0JmNUPJJERhAACR3pCZhdMh0g7/ZdNzeIgoBUr3uJQkliQVI7m7kAk0U0NpA0 ef88hXzzgkorLbc415WY7m3EfayI7bm5HoSmEczwQ9Mbnk7RG4Itq4J66JuXfPEa6EzU d5tGdy5LCTrO3XliKIYCm+9TtKgmyXFBOxQLn76kR4iP24OQogvKN8h2zwa/qV/40KZ9 7RbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750361278; x=1750966078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sL/gnD+RoXyhkM+7is5bQz7YiFPCrbWYEFKrkuC7LHU=; b=b3jL+FwVhDOWDzlyz+xHxZcsaQOpwF+stV8MwHjsrOTYAMFEE6TCG7FMZ/13TukRzE 0uhqsRAwT5bPzL/QCqYDzC0WBuMYsxi1zlMtGkywrMF7rqKiuCwXiN0XXAM/z7iE4ZVq d6Jt2bKq/CzdU+cXBAAE+yRFRJIsq8E/jZTSOqUFplMcdoD42ziagEoEQOgydXpv+3KW WmuU7ZNgGVrTkNsmD69wbIG0wbb3ZZh11/nKmgYWVlR93/olNLCCpVawuFSb1leMavTX Nbtw03jq/KN7jrbt20gI29imD9uPf3W7aW3HlZ5bJ8CYv1KN7PxVd0IO/uCWjM4gY8Of E9XQ== X-Forwarded-Encrypted: i=1; AJvYcCW4na5b1oKo40FM4DELhBlqbS491YupkonzvhkCWi9akkjNO60x4ykHbZNmANUFwaJcNxuxV5kb1fBwthE=@vger.kernel.org X-Gm-Message-State: AOJu0YwPecXNjsPqt4EF2A1EbF/5wG14E4zDpVNE51tQmwlFQG8wJtJU ufgibGYIlUKXpKins3YxZvtQaZKWn8kfx/algQY4Em7cqXYxbc3yJeHofGlC/OXyFEyD269IiQo AnPNLdgD+E6B0zdwaHFH/E7LUUQxguFGUjjKx X-Gm-Gg: ASbGnctbKAre+gD8nuxFkFzOlEogZa9Z/gvdWfvO2MHYe0Tuifnwg2AduSxFeGybut5 l93EU68m3NKOgslFhbQk4dDc0UpkefVWPROoOZSIhudUgB6bsu3O4enaZkNaFLeveCNCOA7Sotd iP12A9ffnadEKDhJrhDx96K5lCbfqGSSeZNApk7UfBwCUtIHiNBRMFakanZRQValjELNlyzIOdB RuU1+Hq6yZAWbgpw2QWWacndaDYX0hZT7hmWTutacTysOChN7Q2SS3L7kzlTjzBSvw6YaEDT/5x oNURhk6NZrUp1ptGHXqKE93Ma/NrWfX+G0v1517ohmHjaaodL8EzqyY= X-Google-Smtp-Source: AGHT+IHzFp7Ayin7ZLuxdt5epZwacsJfi24ByOHXtA/2tQ3yV9AYUgiGyGENqzR3VrIwLw6XQlKq/HIcpRov X-Received: by 2002:ac8:5704:0:b0:4a5:a4d8:3a6b with SMTP id d75a77b69052e-4a77a1aecc3mr1743701cf.2.1750361277885; Thu, 19 Jun 2025 12:27:57 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-4a77a157998sm71631cf.13.2025.06.19.12.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 12:27:57 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::1199]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id D4B483400E6; Thu, 19 Jun 2025 13:27:56 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id D2579E4410B; Thu, 19 Jun 2025 13:27:56 -0600 (MDT) From: Caleb Sander Mateos To: Chris Mason , Josef Bacik , David Sterba , Jens Axboe Cc: Mark Harmstone , linux-btrfs@vger.kernel.org, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 2/4] io_uring/cmd: introduce IORING_URING_CMD_REISSUE flag Date: Thu, 19 Jun 2025 13:27:46 -0600 Message-ID: <20250619192748.3602122-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250619192748.3602122-1-csander@purestorage.com> References: <20250619192748.3602122-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a flag IORING_URING_CMD_REISSUE that ->uring_cmd() implementations can use to tell whether this is the first or subsequent issue of the uring_cmd. This will allow ->uring_cmd() implementations to store information in the io_uring_cmd's pdu across issues. Signed-off-by: Caleb Sander Mateos --- include/linux/io_uring/cmd.h | 2 ++ io_uring/uring_cmd.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index 53408124c1e5..29892f54e0ac 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -6,10 +6,12 @@ #include #include =20 /* only top 8 bits of sqe->uring_cmd_flags for kernel internal use */ #define IORING_URING_CMD_CANCELABLE (1U << 30) +/* io_uring_cmd is being issued again */ +#define IORING_URING_CMD_REISSUE (1U << 31) =20 struct io_uring_cmd { struct file *file; const struct io_uring_sqe *sqe; /* callback to defer completions to task context */ diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 929cad6ee326..7cddc4c1c554 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -257,10 +257,12 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int i= ssue_flags) req->iopoll_start =3D ktime_get_ns(); } } =20 ret =3D file->f_op->uring_cmd(ioucmd, issue_flags); + if (ret =3D=3D -EAGAIN) + ioucmd->flags |=3D IORING_URING_CMD_REISSUE; if (ret =3D=3D -EAGAIN || ret =3D=3D -EIOCBQUEUED) return ret; if (ret < 0) req_set_fail(req); io_req_uring_cleanup(req, issue_flags); --=20 2.45.2 From nobody Thu Oct 9 04:50:04 2025 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77316245006 for ; Thu, 19 Jun 2025 19:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361282; cv=none; b=lDsNkfvfVkTV2MjsZzkwqcPW0yPfGI4N6FxLkneZ57347wxvxcYyfpVVVJYnlW3bTNWAXqdB3whyPK745dmKRjjPv+K7krg8sf57T8ZKzskQIlNjThtt/KqBN7RO6LErCEwUtFliuH/7PwlRJy4wzpO4CNG/tGM2JY6nwrN38vk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361282; c=relaxed/simple; bh=FnPpDqN7O0aPwX/W/1yco6ofOjFg1aDQKv5V46Z7+ks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FuIvZ8l7bKPJi7SbmJsPL53GtkwhdqHDSzWcN+muSKwPGf+5rUJ9+75J7JdhEasE/QW4JrvN+kiixEelsDItUsGG4NxnCuLHVw3JqSDVDQQmjxrXuB3uT1EOgCwmY9o8uqOEfbN59oHnoznYxIfalVDrSLcb1aITfTR21y6YDYo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=G8+WJPES; arc=none smtp.client-ip=209.85.214.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="G8+WJPES" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-23496600df1so2076305ad.2 for ; Thu, 19 Jun 2025 12:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1750361278; x=1750966078; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mybhRJjeD/SDX1/X5lJ4CCixpkUUl0tnOPI9FH5o5Og=; b=G8+WJPESiplzzhpyna5EgK1kyFBSnv64BZUN19yC4lhrCGAlPCrl8JpEWVPDcTdzoQ T4unbnj0bmXn0+DyTc+dVPTtie1eAP3W3AhOORbNxd1abQKsflv0U0VGjNRrxJVzKXMS Cp6hyuoO2g5ZBchQ+0pf2F6dFwdnqIgQHUaq7m/BW99nRLdDHZpUZN+ih8xDuy10/n37 hhcPTqyW54ys/uv8HJKgwS9WJA1G+m3A1CCSxiIGTgpFRu9izTlbuR0qFZYgoq5hU6/r w3+xgj1FCGs+3osK46jNqzcPohmmB7YkvtILVDgbXmATDy456WViZHyhaKOFRXEqZuWx miAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750361278; x=1750966078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mybhRJjeD/SDX1/X5lJ4CCixpkUUl0tnOPI9FH5o5Og=; b=hE0a1AVpY8+AnxDHtTIu4VkcHyJ6iaku0KDHPSvtBjgHxwLF4GO5fuOlQAq1Xc2nl2 cRuBKxA3VLPqlf/Fwjn7q39yp2AhFwWeHH46QQps3F+eXJ/vXUP1DRpIykycDS1pkPFK 3sdqPGWYrYT5MbseVzFF8+bErWJmA8SKie9UebsucVRioeqga9RQRy4GotIO7/b+O3Ys Zm56Pb9jUXOeDx/wx5uKdj6mRd/p0CxdWs1QK+t8lgX/fxKONP/ieSf9s21nFI2kKFFQ F8ZNavK+E6h6wxTrL1RYduanENpcKaOXOe2ihAlxh4Z7/RMK/4TmJH6GDLOEg0M/z5h7 oHsw== X-Forwarded-Encrypted: i=1; AJvYcCURyIsLtg/y3mcacLMtWi4WWxnL+HOVQscP3FeClJqCnwC/dUc6qJ0tTP+LOF5Q8jqXxG2ioDY6yx1V/6M=@vger.kernel.org X-Gm-Message-State: AOJu0YykvVthI7ENao8nIlTxI4qGI8hqgFc2AheiOW4XQmib1WxeJtPj PEXu6bae5hsh7sUxqg1/pkCvkBxqYAd3LiUsPz9kyfKWfI8ZyPlk3unhHmfLiTm8Iob4nkR6kvg +H5a/xru6+GQdLGn2BDE5Ej6pHkP73pI1H6neDwcQBaq2n6T5WlSJ X-Gm-Gg: ASbGncsroRUaEkidm3CC/9rXXMgx1XveUB8vY60uSL+kmuRQOc8pX6xP0LTyQnZFo/Q nT8FrV4aQ9dsjMlxd8sESOsaIHqmwgAxFPGV1fDL3FTPzwAVnNrE4aciQgbVPIUrhubgLVZyhSE 6UTH8WNmYmZiP2bPO1Lo0wGWtx4BqF/dUDEGlLc9a7k9kIK3u9BzAELNw3Hsn3Qa+PLjkMkASp3 V/ctQJEtNQNT9nEeqPN+uAhrPUs7W4AKVXLq2cqTSUXKE2jdUTQJSEzNz5w/kNaz6W3zjvwABPl muLSEdpS6qwR/A7QbQLZkXQc/iX8huaK121iMsDj X-Google-Smtp-Source: AGHT+IEfrbbqTW03ZQbYjJQQRg096jlIfeAiuyNMhayogR1nYrPRl8KDaYpdUx/qZmaAflOknzL1laWBTyeO X-Received: by 2002:a17:903:24f:b0:235:ca87:37d0 with SMTP id d9443c01a7336-237d9aa8e20mr65ad.11.1750361277865; Thu, 19 Jun 2025 12:27:57 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-237d8324080sm120925ad.45.2025.06.19.12.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 12:27:57 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 56FD234031F; Thu, 19 Jun 2025 13:27:57 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 55009E4410B; Thu, 19 Jun 2025 13:27:57 -0600 (MDT) From: Caleb Sander Mateos To: Chris Mason , Josef Bacik , David Sterba , Jens Axboe Cc: Mark Harmstone , linux-btrfs@vger.kernel.org, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 3/4] btrfs/ioctl: store btrfs_uring_encoded_data in io_btrfs_cmd Date: Thu, 19 Jun 2025 13:27:47 -0600 Message-ID: <20250619192748.3602122-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250619192748.3602122-1-csander@purestorage.com> References: <20250619192748.3602122-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" btrfs is the only user of struct io_uring_cmd_data and its op_data field. Switch its ->uring_cmd() implementations to store the struct btrfs_uring_encoded_data * in the struct io_btrfs_cmd, overlayed with io_uring_cmd's pdu field. This avoids having to touch another cache line to access the struct btrfs_uring_encoded_data *, and allows op_data and struct io_uring_cmd_data to be removed. Signed-off-by: Caleb Sander Mateos --- fs/btrfs/ioctl.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index ff15160e2581..6183729c93a1 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4627,10 +4627,17 @@ static int btrfs_ioctl_encoded_write(struct file *f= ile, void __user *argp, bool add_wchar(current, ret); inc_syscw(current); return ret; } =20 +struct btrfs_uring_encoded_data { + struct btrfs_ioctl_encoded_io_args args; + struct iovec iovstack[UIO_FASTIOV]; + struct iovec *iov; + struct iov_iter iter; +}; + /* * Context that's attached to an encoded read io_uring command, in cmd->pd= u. It * contains the fields in btrfs_uring_read_extent that are necessary to fi= nish * off and cleanup the I/O in btrfs_uring_read_finished. */ @@ -4648,10 +4655,11 @@ struct btrfs_uring_priv { int err; bool compressed; }; =20 struct io_btrfs_cmd { + struct btrfs_uring_encoded_data *data; struct btrfs_uring_priv *priv; }; =20 static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned i= nt issue_flags) { @@ -4706,10 +4714,11 @@ static void btrfs_uring_read_finished(struct io_uri= ng_cmd *cmd, unsigned int iss __free_page(priv->pages[index]); =20 kfree(priv->pages); kfree(priv->iov); kfree(priv); + kfree(bc->data); } =20 void btrfs_uring_read_extent_endio(void *ctx, int err) { struct btrfs_uring_priv *priv =3D ctx; @@ -4789,17 +4798,10 @@ static int btrfs_uring_read_extent(struct kiocb *io= cb, struct iov_iter *iter, btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); kfree(priv); return ret; } =20 -struct btrfs_uring_encoded_data { - struct btrfs_ioctl_encoded_io_args args; - struct iovec iovstack[UIO_FASTIOV]; - struct iovec *iov; - struct iov_iter iter; -}; - static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int= issue_flags) { size_t copy_end_kernel =3D offsetofend(struct btrfs_ioctl_encoded_io_args= , flags); size_t copy_end; int ret; @@ -4811,11 +4813,15 @@ static int btrfs_uring_encoded_read(struct io_uring= _cmd *cmd, unsigned int issue loff_t pos; struct kiocb kiocb; struct extent_state *cached_state =3D NULL; u64 start, lockend; void __user *sqe_addr; - struct btrfs_uring_encoded_data *data =3D io_uring_cmd_get_async_data(cmd= )->op_data; + struct io_btrfs_cmd *bc =3D io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd); + struct btrfs_uring_encoded_data *data =3D NULL; + + if (cmd->flags & IORING_URING_CMD_REISSUE) + data =3D bc->data; =20 if (!capable(CAP_SYS_ADMIN)) { ret =3D -EPERM; goto out_acct; } @@ -4841,11 +4847,11 @@ static int btrfs_uring_encoded_read(struct io_uring= _cmd *cmd, unsigned int issue if (!data) { ret =3D -ENOMEM; goto out_acct; } =20 - io_uring_cmd_get_async_data(cmd)->op_data =3D data; + bc->data =3D data; =20 if (issue_flags & IO_URING_F_COMPAT) { #if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT) struct btrfs_ioctl_encoded_io_args_32 args32; =20 @@ -4939,21 +4945,28 @@ static int btrfs_uring_encoded_read(struct io_uring= _cmd *cmd, unsigned int issue out_acct: if (ret > 0) add_rchar(current, ret); inc_syscr(current); =20 + if (ret !=3D -EIOCBQUEUED && ret !=3D -EAGAIN) + kfree(data); + return ret; } =20 static int btrfs_uring_encoded_write(struct io_uring_cmd *cmd, unsigned in= t issue_flags) { loff_t pos; struct kiocb kiocb; struct file *file; ssize_t ret; void __user *sqe_addr; - struct btrfs_uring_encoded_data *data =3D io_uring_cmd_get_async_data(cmd= )->op_data; + struct io_btrfs_cmd *bc =3D io_uring_cmd_to_pdu(cmd, struct io_btrfs_cmd); + struct btrfs_uring_encoded_data *data =3D NULL; + + if (cmd->flags & IORING_URING_CMD_REISSUE) + data =3D bc->data; =20 if (!capable(CAP_SYS_ADMIN)) { ret =3D -EPERM; goto out_acct; } @@ -4971,11 +4984,11 @@ static int btrfs_uring_encoded_write(struct io_urin= g_cmd *cmd, unsigned int issu if (!data) { ret =3D -ENOMEM; goto out_acct; } =20 - io_uring_cmd_get_async_data(cmd)->op_data =3D data; + bc->data =3D data; =20 if (issue_flags & IO_URING_F_COMPAT) { #if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT) struct btrfs_ioctl_encoded_io_args_32 args32; =20 @@ -5061,10 +5074,13 @@ static int btrfs_uring_encoded_write(struct io_urin= g_cmd *cmd, unsigned int issu kfree(data->iov); out_acct: if (ret > 0) add_wchar(current, ret); inc_syscw(current); + + if (ret !=3D -EAGAIN) + kfree(data); return ret; } =20 int btrfs_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) { --=20 2.45.2 From nobody Thu Oct 9 04:50:04 2025 Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 788B824501D for ; Thu, 19 Jun 2025 19:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361282; cv=none; b=PfUC7vazWDj3nzp8looC6JfKhWzufO4e0Mv3cwexbVsOwpKdtKQrjH6FymsNiwvaTsb3qj/4v+ql55Lx13nwXK1Hsjzq8W1LCOwktY1aoMYraMBrguLNIXM73jAmYZR8v6GjXxLmkWszk0cI+/0UqTUUAa9KA3yP7nS/1ur4JnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750361282; c=relaxed/simple; bh=WAdMGPaNB/QCo15dUEuI4GjK/9ObZxnK/dP6No/A+ms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZZ0DRydR90Cc7bmcUiyWbSWGY/41/TVEf8LlDci0m8pg3wEKmX6kvGeQwUg9HpxegLoBaxZ/oehZQbi5CAqxxn/XdWEqOE/JPmC9nQq6EbDVuZqo0bvEhmgYwit5R+3pHRY9332LoyCiXSKbG7GY7gL+cZo+alz+IkovWkhD6Xg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=MNDjIQjF; arc=none smtp.client-ip=209.85.214.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="MNDjIQjF" Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-234ae2bf851so1725755ad.1 for ; Thu, 19 Jun 2025 12:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1750361278; x=1750966078; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O9mph6iqzfvkH6Em/eA5BqcG3h1FrFQ3qkFwr+Q5lfM=; b=MNDjIQjFblz/KRs7ykCkW19Y19OCwpXEZdxUPr8cG471PRjW/lIyD2YWT7cAX/9J4z pIBAy6mlCzPhvUe0WW19hN3HHG+el9F2oH2+ZGKCMJbTo4MgFKxroOzcylpsyfPMzqMt HzvC63U3PwJyZV64kHcM6cSoMwCXUH3vyT5PHygfgFXHIZ0u/qkWlU3+ru1OTNgV/4ie Huf1V7seOqa0njvTlTclzTS6ZYLt1j3QWCWuw2zWqjK5ZP9nD899AflltIkoFvI5yHPc joAt4827ApL7RH/4AnUr9O3C3dcNeXMuSqYLNuIB4mk3vZ6rpVNy3KghiAnuOE5I1t9d DU+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750361278; x=1750966078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O9mph6iqzfvkH6Em/eA5BqcG3h1FrFQ3qkFwr+Q5lfM=; b=o85HLvwfSJpcP1a/9q9TVuU6/huwRQxhWifGNaIUUPbU/6fqDFY8Auwx1w5JO6EjmU qUQ7Jy2o2orAGHFzh8fpJHuceEoi0aqQhBvFBFxr9pEJdVUyS+aVO4qwJVcGMLQ8OyH4 F8dv4a6p4yNLPaDx1WnYw1aFkgYFOQYTncjoxRlCiTgMKRQqueNKdhXxyXfvXCg2BOuo eaeiW+GRg/X35Y6vpiB8Ee7BFheSIr6CEagV2ypVaMh9A6pmQVJh/56iYcQZtK2ZjPtT VLziy6xCypS+ytHxtNftudZv3zceR8qs9k/tBYqpVYtUPo+xBK9frKBiPPElnGJrfUtA OCwQ== X-Forwarded-Encrypted: i=1; AJvYcCX0QkTBXXqT1ogOFpL50r5e6H2CWDMm29FZHyHArZ2nl+6GP9Y123/9lsvAQvMUxv0txkxrlJceOSBzZLw=@vger.kernel.org X-Gm-Message-State: AOJu0YwHTBIKqTRP6J66Nnkbe2CDqb+0P8+XpnxvvZGK0DWvYwla2wDW li+2SWRHj0st8w6U5Hwx1XifK2EiHZS5EEO1cgjKaiILP53zr7AqKqe9SZqHJMq1bOsOUBJKn/E icdyVVmP2X2vW+oCaLuna04hzcz+7XjshGOVm X-Gm-Gg: ASbGncueIgBjB3PlovGGIoe+7io/bwujJGNGIb87Mar9YvbPQen+w5QBv829wsmCb8z zOIKoMQnf82WCPgyHZjtK0jsz1PpLUOLL/8QFXe+jBWtcOd7jppxlOVNLvgG1PKad6xMEzvSsQX cRnkGf9u0CWalBYXOYKKgPnAGfJEHHUhrjViAUpVNpQAyXscPrSYKk5vO38YFW+AoFyuxpw6DYL Ux1emLkOheeVBN65BBUkcUGJ8SjFzYOYa9gRdHcJZInaDtwF5XTu6VPFLuUuCmZ9/hrmJgqm7WF qZ0TKX6lYS9rTfQh0XT7u122qRZJzbvAC+JahXuFJmSbg/NeVz3NK5U= X-Google-Smtp-Source: AGHT+IGYwH/UnRloaxJSDbMCTU+OrSVFFK8LWCGEl/44Ty0QzPW7F7yR2nACYfTcFtaX1Uuy3m3j3z1yjWFt X-Received: by 2002:a17:902:ea10:b0:234:ed31:fc97 with SMTP id d9443c01a7336-237d9abddcfmr46325ad.12.1750361278556; Thu, 19 Jun 2025 12:27:58 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-237d84f2724sm105245ad.66.2025.06.19.12.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 12:27:58 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id E768F34179F; Thu, 19 Jun 2025 13:27:57 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id E5315E4410B; Thu, 19 Jun 2025 13:27:57 -0600 (MDT) From: Caleb Sander Mateos To: Chris Mason , Josef Bacik , David Sterba , Jens Axboe Cc: Mark Harmstone , linux-btrfs@vger.kernel.org, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 4/4] io_uring/cmd: remove struct io_uring_cmd_data Date: Thu, 19 Jun 2025 13:27:48 -0600 Message-ID: <20250619192748.3602122-5-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250619192748.3602122-1-csander@purestorage.com> References: <20250619192748.3602122-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are no more users of struct io_uring_cmd_data and its op_data field. Remove it to shave 8 bytes from struct io_async_cmd and eliminate a store and load for every uring_cmd. Signed-off-by: Caleb Sander Mateos --- include/linux/io_uring/cmd.h | 9 --------- io_uring/uring_cmd.c | 12 +----------- io_uring/uring_cmd.h | 1 - 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index 29892f54e0ac..cfa6d0c0c322 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -19,14 +19,10 @@ struct io_uring_cmd { u32 cmd_op; u32 flags; u8 pdu[32]; /* available inline for free use */ }; =20 -struct io_uring_cmd_data { - void *op_data; -}; - static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe) { return sqe->cmd; } =20 @@ -135,15 +131,10 @@ static inline void io_uring_cmd_complete_in_task(stru= ct io_uring_cmd *ioucmd, static inline struct task_struct *io_uring_cmd_get_task(struct io_uring_cm= d *cmd) { return cmd_to_io_kiocb(cmd)->tctx->task; } =20 -static inline struct io_uring_cmd_data *io_uring_cmd_get_async_data(struct= io_uring_cmd *cmd) -{ - return cmd_to_io_kiocb(cmd)->async_data; -} - /* * Return uring_cmd's context reference as its context handle for driver to * track per-context resource, such as registered kernel IO buffer */ static inline void *io_uring_cmd_ctx_handle(struct io_uring_cmd *cmd) diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 7cddc4c1c554..376404ffb3f9 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -23,25 +23,19 @@ void io_cmd_cache_free(const void *entry) =20 static void io_req_uring_cleanup(struct io_kiocb *req, unsigned int issue_= flags) { struct io_uring_cmd *ioucmd =3D io_kiocb_to_cmd(req, struct io_uring_cmd); struct io_async_cmd *ac =3D req->async_data; - struct io_uring_cmd_data *cache =3D &ac->data; - - if (cache->op_data) { - kfree(cache->op_data); - cache->op_data =3D NULL; - } =20 if (issue_flags & IO_URING_F_UNLOCKED) return; =20 io_alloc_cache_vec_kasan(&ac->vec); if (ac->vec.nr > IO_VEC_CACHE_SOFT_CAP) io_vec_free(&ac->vec); =20 - if (io_alloc_cache_put(&req->ctx->cmd_cache, cache)) { + if (io_alloc_cache_put(&req->ctx->cmd_cache, ac)) { ioucmd->sqe =3D NULL; req->async_data =3D NULL; req->flags &=3D ~(REQ_F_ASYNC_DATA|REQ_F_NEED_CLEANUP); } } @@ -185,17 +179,13 @@ static int io_uring_cmd_prep_setup(struct io_kiocb *r= eq, const struct io_uring_sqe *sqe) { struct io_uring_cmd *ioucmd =3D io_kiocb_to_cmd(req, struct io_uring_cmd); struct io_async_cmd *ac; =20 - /* see io_uring_cmd_get_async_data() */ - BUILD_BUG_ON(offsetof(struct io_async_cmd, data) !=3D 0); - ac =3D io_uring_alloc_async_data(&req->ctx->cmd_cache, req); if (!ac) return -ENOMEM; - ac->data.op_data =3D NULL; =20 /* * Unconditionally cache the SQE for now - this is only needed for * requests that go async, but prep handlers must ensure that any * sqe data is stable beyond prep. Since uring_cmd is special in diff --git a/io_uring/uring_cmd.h b/io_uring/uring_cmd.h index e6a5142c890e..351c58c26679 100644 --- a/io_uring/uring_cmd.h +++ b/io_uring/uring_cmd.h @@ -2,11 +2,10 @@ =20 #include #include =20 struct io_async_cmd { - struct io_uring_cmd_data data; struct iou_vec vec; struct io_uring_sqe sqes[2]; }; =20 int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags); --=20 2.45.2