Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     Jens Axboe <axboe@kernel.dk>,
        Pavel Begunkov <asml.silence@gmail.com>,
        io-uring@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] io_uring: Redefined the meaning of io_alloc_async_data's return value
Date:   Mon, 10 Jul 2023 17:09:56 +0800
Message-Id: <20230710090957.10463-1-luhongfei@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3PZsJrtOmd8X5miX7Bz/3c7Gs+SsQpjopPydl5YKoCVd70qUalAx2nYoSr8u?=
 =?us-ascii?Q?Usw2F+RjoMAoUZTPmJl/BFv+kZJYjlnQJrzax+tbpznDmRb4qCUAdHb1I54y?=
 =?us-ascii?Q?I0BaZOvej1X5GtXst31MVbyi3GNGKoYG643KfnnKksYOACcR1Vo+2vFXyzAk?=
 =?us-ascii?Q?6RueVfj6JmirEc3a8m/Ct57QFPbmQEJ5cb1cwR9Bofq5L8fJoHtXlfZFH4CA?=
 =?us-ascii?Q?VZZhETxeKGct1yuvDqAYeC05z9FBZgZ/8vZLii+Jip75XyiKlMvaOml7dCqs?=
 =?us-ascii?Q?EO6NkCLpzrYYeMBmMKKxwkQP9GshowDuyVckz19xg8cMS9qcvhVGQmf2tgH2?=
 =?us-ascii?Q?cYydmxOCYy1PFQoBbn/gzsuYE97DIvdDpubq4lkzfE7zoiUctICYebOlkoW7?=
 =?us-ascii?Q?b+GE8hIXta3JpKiMM8ViKSxfh+PvkjDgnxEl87bAD3HjkUB2iot3ucxA+wck?=
 =?us-ascii?Q?cUq5ISF2OdBTZjS9FFJKexUd9BhcszLBE0mRHFzo0iaZ7rT9lI/ng+1RAQdh?=
 =?us-ascii?Q?YHRFspN5onv0VhoME+1dArOffZVD4frZWO+mSFQSzdVPiOAl7t3Bk8UPrSVS?=
 =?us-ascii?Q?7lidO6H7a3z4j/b8UlS914KxIm1TjcBaRfNVctQY9Rqx/755cySgtAPgfasO?=
 =?us-ascii?Q?/QBm2oKe0PfzBASjRl1P3ZxcOwskjuSfUZxDVcrxGzrIZkSei1iep1ZNSOoS?=
 =?us-ascii?Q?WwHo1cODUw7o4oQLMS5yLwX0UWJVdcdhkc7LCgpHLH9Ftsi6jaSX0oYsmxfv?=
 =?us-ascii?Q?Ime2K7u+iyN4BIMcftaGZB6UiZiwdOiIKeYrQkLZgphRcB8ooJyuwWk6DNBS?=
 =?us-ascii?Q?CZ2jA2ulxCsQsexL6lWKEriocyXuCJr7IVe+gp01N5RTn85dt2WWBSI+rsQl?=
 =?us-ascii?Q?SEdWHrqy0A+/7GbayGAVRPHcI/ukGWDx/z0bjuJss+Ux+o0YHALSTxPU7S4f?=
 =?us-ascii?Q?yY4OZ+pnMLFWLLRGd5+v9pn336I/HHebb6prLllU4snMYMivMWo/USYVcskj?=
 =?us-ascii?Q?yCsbbaHb2q3rZakvLZwV2CMnyzFbQXMUak5hhxl4iIGyMc4KNJlcxd8eFBis?=
 =?us-ascii?Q?MiBCdtwDGoPEz6WGNFbQ/cg7PKExUlzDcTzSHAkYWQSfj0vHG4+W6V5Tm8EK?=
 =?us-ascii?Q?X/kSMqSjLkmJNKvbdzPkWd1VGaq8OLX0D1ollG0jdyBq7dikMH4nBYOOtrJl?=
 =?us-ascii?Q?mjKDXEKgJXluDn5eHllGooEludRVgvqjr27IBxGDXYBPtMuiS5E3yYarlqcp?=
 =?us-ascii?Q?sl/x4jc7nscIpmM7erSrQEweq8PVmC5ioBcIFe9jYed+smojBDUS9jv9Ls0N?=
 =?us-ascii?Q?1eJaWefM4EEwvi0hIIqXJ1ovWstU+rV/eoSZfrku1bz7llbOsOtaaXPhucRE?=
 =?us-ascii?Q?NQm6Iaz6JgDZ0JNDnKXoN9kW3sR2VH8qABxMfNIY47GXjtd2lT684MjwDAEa?=
 =?us-ascii?Q?P17BeXrICngysciIpB5U7tZxjKbTViTz07TUUknF9qLRrpA0FAFl1fi0+yj9?=
 =?us-ascii?Q?GgOmsh8J2G1QitK4poHp+QYm23TG3NINrdxVJHI0a0O+5d0Aaw3OnKwGO/WC?=
 =?us-ascii?Q?a6+4IU/V6nAt0JoFF8laIa0s27dRS0B3Fwf5ErFu?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a070c65-fb3b-455b-dc43-08db8125766c
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 09:10:10.5844
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: WnzFOUebMhgpPyWw1lHchQQJ4ZnkGmWbSjBKIu45HBwDo9ImX/LNcmRXnpYI1rQHoLnW6oTKhZwMYgAZlBfpSA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5579
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Usually, successful memory allocation returns true and failure returns false,
which is more in line with the intuitive perception of most people. So it
is necessary to redefine the meaning of io_alloc_async_data's return value.

This could enhance the readability of the code and reduce the possibility
of confusion.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 io_uring/io_uring.c  | 13 +++++++++----
 io_uring/net.c       |  4 ++--
 io_uring/rw.c        |  2 +-
 io_uring/timeout.c   |  2 +-
 io_uring/uring_cmd.c |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index e8096d502a7c..19f14b7b417d 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1753,14 +1753,19 @@ unsigned int io_file_get_flags(struct file *file)
 	return res;
 }
 
+/*
+ * Alloc async data to the req.
+ *
+ * Returns 'true' if the allocation is successful, 'false' otherwise.
+ */
 bool io_alloc_async_data(struct io_kiocb *req)
 {
 	WARN_ON_ONCE(!io_cold_defs[req->opcode].async_size);
 	req->async_data = kmalloc(io_cold_defs[req->opcode].async_size, GFP_KERNEL);
-	if (req->async_data) {
-		req->flags |= REQ_F_ASYNC_DATA;
+	if (!req->async_data)
 		return false;
-	}
+
+	req->flags |= REQ_F_ASYNC_DATA;
 	return true;
 }
 
@@ -1777,7 +1782,7 @@ int io_req_prep_async(struct io_kiocb *req)
 	if (WARN_ON_ONCE(req_has_async_data(req)))
 		return -EFAULT;
 	if (!def->manual_alloc) {
-		if (io_alloc_async_data(req))
+		if (!io_alloc_async_data(req))
 			return -EAGAIN;
 	}
 	return cdef->prep_async(req);
diff --git a/io_uring/net.c b/io_uring/net.c
index eb1f51ddcb23..49e659d3a874 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -152,7 +152,7 @@ static struct io_async_msghdr *io_msg_alloc_async(struct io_kiocb *req,
 		}
 	}
 
-	if (!io_alloc_async_data(req)) {
+	if (io_alloc_async_data(req)) {
 		hdr = req->async_data;
 		hdr->free_iov = NULL;
 		return hdr;
@@ -1494,7 +1494,7 @@ int io_connect(struct io_kiocb *req, unsigned int issue_flags)
 		}
 		if (req_has_async_data(req))
 			return -EAGAIN;
-		if (io_alloc_async_data(req)) {
+		if (!io_alloc_async_data(req)) {
 			ret = -ENOMEM;
 			goto out;
 		}
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 1bce2208b65c..90d4be57a811 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -523,7 +523,7 @@ static int io_setup_async_rw(struct io_kiocb *req, const struct iovec *iovec,
 	if (!req_has_async_data(req)) {
 		struct io_async_rw *iorw;
 
-		if (io_alloc_async_data(req)) {
+		if (!io_alloc_async_data(req)) {
 			kfree(iovec);
 			return -ENOMEM;
 		}
diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index fb0547b35dcd..35a756d22781 100644
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -534,7 +534,7 @@ static int __io_timeout_prep(struct io_kiocb *req,
 
 	if (WARN_ON_ONCE(req_has_async_data(req)))
 		return -EFAULT;
-	if (io_alloc_async_data(req))
+	if (!io_alloc_async_data(req))
 		return -ENOMEM;
 
 	data = req->async_data;
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 476c7877ce58..716a28495bf3 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -139,7 +139,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags)
 	ret = file->f_op->uring_cmd(ioucmd, issue_flags);
 	if (ret == -EAGAIN) {
 		if (!req_has_async_data(req)) {
-			if (io_alloc_async_data(req))
+			if (!io_alloc_async_data(req))
 				return -ENOMEM;
 			io_uring_cmd_prep_async(req);
 		}
-- 
2.39.0