From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D4C5C07E9D for ; Mon, 26 Sep 2022 17:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231189AbiIZRmc (ORCPT ); Mon, 26 Sep 2022 13:42:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230179AbiIZRmN (ORCPT ); Mon, 26 Sep 2022 13:42:13 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D557120A9 for ; Mon, 26 Sep 2022 10:09:36 -0700 (PDT) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28QA5BKZ026969 for ; Mon, 26 Sep 2022 10:09:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=c4USphZiYFgb2XSoT9kDp0XititVsmIX3HgAhXfYStU=; b=L13AApzljZgtxIVRSQt390XYXSNG760bi4uvmNHFRsUIfu/OoMWp4FnuI/pWDLYn1bT+ tBaUF0dajTXjQZqvgPhjQbVtrJXD5nvh5R2EEi1/VL89RaO1zoGOdLsv8/iM7FTJVxWO yK4nvK1pIV7Ug/91L63EHQmssKbaCn+VAGY= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3jsy0tmp79-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 26 Sep 2022 10:09:36 -0700 Received: from twshared3028.05.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 10:09:34 -0700 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id D1F636B0A92E; Mon, 26 Sep 2022 10:09:27 -0700 (PDT) From: Dylan Yudaken To: Jens Axboe , Pavel Begunkov CC: , , , Dylan Yudaken Subject: [PATCH v2 2/3] io_uring: simplify __io_uring_add_tctx_node Date: Mon, 26 Sep 2022 10:09:26 -0700 Message-ID: <20220926170927.3309091-3-dylany@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220926170927.3309091-1-dylany@fb.com> References: <20220926170927.3309091-1-dylany@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: rSutx3HI_bKPvokog1JJvqQ1UYQiHlSk X-Proofpoint-ORIG-GUID: rSutx3HI_bKPvokog1JJvqQ1UYQiHlSk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-26_09,2022-09-22_02,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Remove submitter parameter from __io_uring_add_tctx_node. It was only called from one place, and we can do that logic in that one place. Signed-off-by: Dylan Yudaken --- io_uring/io_uring.c | 2 +- io_uring/tctx.c | 30 ++++++++++++++++++++---------- io_uring/tctx.h | 6 ++++-- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 242d896c00f3..a4024d56240f 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3183,7 +3183,7 @@ static int io_uring_install_fd(struct io_ring_ctx *= ctx, struct file *file) if (fd < 0) return fd; =20 - ret =3D __io_uring_add_tctx_node(ctx, false); + ret =3D __io_uring_add_tctx_node(ctx); if (ret) { put_unused_fd(fd); return ret; diff --git a/io_uring/tctx.c b/io_uring/tctx.c index 7f97d97fef0a..dd0205fcdb13 100644 --- a/io_uring/tctx.c +++ b/io_uring/tctx.c @@ -105,18 +105,12 @@ static int io_register_submitter(struct io_ring_ctx= *ctx) return ret; } =20 -int __io_uring_add_tctx_node(struct io_ring_ctx *ctx, bool submitter) +int __io_uring_add_tctx_node(struct io_ring_ctx *ctx) { struct io_uring_task *tctx =3D current->io_uring; struct io_tctx_node *node; int ret; =20 - if ((ctx->flags & IORING_SETUP_SINGLE_ISSUER) && submitter) { - ret =3D io_register_submitter(ctx); - if (ret) - return ret; - } - if (unlikely(!tctx)) { ret =3D io_uring_alloc_task_context(current, ctx); if (unlikely(ret)) @@ -150,8 +144,24 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx= , bool submitter) list_add(&node->ctx_node, &ctx->tctx_list); mutex_unlock(&ctx->uring_lock); } - if (submitter) - tctx->last =3D ctx; + return 0; +} + +int __io_uring_add_tctx_node_from_submit(struct io_ring_ctx *ctx) +{ + int ret; + + if (ctx->flags & IORING_SETUP_SINGLE_ISSUER) { + ret =3D io_register_submitter(ctx); + if (ret) + return ret; + } + + ret =3D __io_uring_add_tctx_node(ctx); + if (ret) + return ret; + + current->io_uring->last =3D ctx; return 0; } =20 @@ -259,7 +269,7 @@ int io_ringfd_register(struct io_ring_ctx *ctx, void = __user *__arg, return -EINVAL; =20 mutex_unlock(&ctx->uring_lock); - ret =3D __io_uring_add_tctx_node(ctx, false); + ret =3D __io_uring_add_tctx_node(ctx); mutex_lock(&ctx->uring_lock); if (ret) return ret; diff --git a/io_uring/tctx.h b/io_uring/tctx.h index 25974beed4d6..608e96de70a2 100644 --- a/io_uring/tctx.h +++ b/io_uring/tctx.h @@ -9,7 +9,8 @@ struct io_tctx_node { int io_uring_alloc_task_context(struct task_struct *task, struct io_ring_ctx *ctx); void io_uring_del_tctx_node(unsigned long index); -int __io_uring_add_tctx_node(struct io_ring_ctx *ctx, bool submitter); +int __io_uring_add_tctx_node(struct io_ring_ctx *ctx); +int __io_uring_add_tctx_node_from_submit(struct io_ring_ctx *ctx); void io_uring_clean_tctx(struct io_uring_task *tctx); =20 void io_uring_unreg_ringfd(void); @@ -27,5 +28,6 @@ static inline int io_uring_add_tctx_node(struct io_ring= _ctx *ctx) =20 if (likely(tctx && tctx->last =3D=3D ctx)) return 0; - return __io_uring_add_tctx_node(ctx, true); + + return __io_uring_add_tctx_node_from_submit(ctx); } --=20 2.30.2