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: A new function has been defined to make get/put exist in pairs
Date:   Thu,  6 Jul 2023 17:32:08 +0800
Message-Id: <20230706093208.6072-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?C1D6Femj/CYf2uOVSiUVoGbD7N3kLlVMAMUL2GKIDU9knbUIque/SE1bMqL9?=
 =?us-ascii?Q?KMWMyOrlnFVQNlV3sy7q6etctBvC6cpMhj581l1j/yomvc6XRLCpaDDdld/r?=
 =?us-ascii?Q?t88vpu/tS/vDDjrkPetNruTNf9spynwXOninQypkkQifW86gL9pBmJWs9+LO?=
 =?us-ascii?Q?OhIOSHiaPMPNMCFlOkXJKu1WH20qfKvVjAOKuZZXIdVDEUtkdVj92lY5es/i?=
 =?us-ascii?Q?+7GZ1hlD/JXcKVyExA7T4fN4tYHAm+l67z266XimTaTQua5iU8AuJekHoOBC?=
 =?us-ascii?Q?NaeOQO4c6O0Kt6vf6Q6UiiQ1NxtgjV69EmVGEY/mpkuOij6GF3ckO4pUJhlJ?=
 =?us-ascii?Q?y9YiuetylRmx87zRBhnG67+MRk+L4T6puoK8M2g0H98yabtSSKDCMhJH6Qmf?=
 =?us-ascii?Q?vZc/9M0Byl7VDsoQhKP4y7WIxZpCLWJY1W68G0VoTlZi5B7vo0J1H5O0Z4gD?=
 =?us-ascii?Q?7DxppL+tXlZsXLASJoXF1gz1CxVgL/fkbm3dWOxK9r9u3hwhrc0cQfH4ysK2?=
 =?us-ascii?Q?1Ibm6b5d5XqNy8wgEhqVEWSsD+oeEnAiks23cLy5tdL4ZEM21zh6V74WiSe9?=
 =?us-ascii?Q?ll6DNWcDriBVF/rI3wzhZEyuFp642NPUvoQO9mgKxNC8nHLs+oK4OGSiZ3a7?=
 =?us-ascii?Q?7TSmKIPFwXJ+OsxyVCpL1yyVPZyeati3BOSxw1PlHS+LDLqcha7piFZHfPTk?=
 =?us-ascii?Q?aGmcDRG8Q8IztSRc4WHl88QEpawDYqduLqiCoeI5L+q53tHueol8KTSH3+PT?=
 =?us-ascii?Q?lv8adPX1MMB9UiA7fS+2zF8TYVblZuicOQmtFLt3ln5x4aj0RM6CUN/xMXuf?=
 =?us-ascii?Q?tgxUfKyz8Yf0J3+GZ95gMZ9f0A0sEscsRljdO0r/ccCmo7tEn0NH4Io4hMoJ?=
 =?us-ascii?Q?uV2HhJCTIP0oFfqywqnFki4q79PELRRRqKUrtyZw5wE2cACTqd2rYcP6IJSP?=
 =?us-ascii?Q?W519sQ9F1rSlFgXN4KhgTU0yswHeinu584mckc52+5UBPX0Ur1Th1et0jJWD?=
 =?us-ascii?Q?DjErjeh4wYXpcWgY1LH2ZSmGNpBh/fkIJ/XziyzHX+V7y71sJ+HwlbRG0miH?=
 =?us-ascii?Q?JKynYwSrNITopUSn7hkVtnUGP+U8LqNcCsV3CsiX5WUUWCaXfvkZrkFL+iHQ?=
 =?us-ascii?Q?j7NNi0qHSeNUoQXzj4C4R+D1/m0n6gQRYynQOOHdabGAvMrd7NXz+m56ka2u?=
 =?us-ascii?Q?+PosY8Ocvd/oouLQsBPfB2hToN0YP4OyGIyH1bM/Iv0KVH77it21/fM1THLp?=
 =?us-ascii?Q?SOl0hTA/MLU14UpKokzG7StuwqXJpkoLDQzq1eteKjptQykqXtPxeYXRG4Kk?=
 =?us-ascii?Q?14EHMgHRfv5DjbY4J6e2R4+WOoUWg8c9vMPwt79/T0cVDfVFXt1uJE3P63ho?=
 =?us-ascii?Q?uD9ffqQu4jXT9v4Om5876j4016EcwbsqLuhu9KpqC9v0e63GGRlH1QmcJWXd?=
 =?us-ascii?Q?pv0gWG0XWyzr3BP7Z15EKI355BH1KUnx1ED8COK7v1RCiA7KYfZlswxtitbG?=
 =?us-ascii?Q?zVZZcwqI621omrVaeicTqeE+FaIXW16rATFp1Kw8SzUrc6e3hAot5HZ4AHAS?=
 =?us-ascii?Q?OzdJqCrxPIFhwUu5rkznazzQVxhpbJf08UbOExud?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 24cbbbd8-3123-40df-e541-08db7e03e588
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 09:32:20.6029
 (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: e0SBZ/OtSFNqxLJHfhwxXpMzphwnJkhsK6PXvJD8fUv38FRVKRoP1wngX79Dd7ToygwVK+iqXuZJqTV1QN3liA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6380
X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=no 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

A new function called io_put_task_refs has been defined for pairing
with io_get_task_refs.

In io_submit_sqes(), when req is not fully sent(i.e. left != 0), it is
necessary to call the io_put_task_refs() to recover the current process's
cached_refs and pair it with the io_get_task_refs(), which is easy to
understand and looks more regular.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 io_uring/io_uring.c | 2 +-
 io_uring/io_uring.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index e8096d502a7c..43844bc2bc62 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2421,7 +2421,7 @@ int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr)
 		/* try again if it submitted nothing and can't allocate a req */
 		if (!ret && io_req_cache_empty(ctx))
 			ret = -EAGAIN;
-		current->io_uring->cached_refs += left;
+		io_put_task_refs(left);
 	}
 
 	io_submit_state_end(ctx);
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index d3606d30cf6f..bf01c56322c9 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -342,6 +342,11 @@ static inline void io_get_task_refs(int nr)
 		io_task_refs_refill(tctx);
 }
 
+static inline void io_put_task_refs(int nr)
+{
+	current->io_uring->cached_refs += nr;
+}
+
 static inline bool io_req_cache_empty(struct io_ring_ctx *ctx)
 {
 	return !ctx->submit_state.free_list.next;
-- 
2.39.0