From patchwork Wed Nov 23 11:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Yudaken X-Patchwork-Id: 13053471 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 89138C433FE for ; Wed, 23 Nov 2022 11:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237567AbiKWLHl (ORCPT ); Wed, 23 Nov 2022 06:07:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237732AbiKWLHH (ORCPT ); Wed, 23 Nov 2022 06:07:07 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FD2F20B for ; Wed, 23 Nov 2022 03:06:50 -0800 (PST) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ANB4GP9001733 for ; Wed, 23 Nov 2022 03:06:49 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=SPE3OypV1PIZXo3fdcwq8SDYDd8wDO+IXZtK61ofzVA=; b=IuWwxo8Jj3Bo6nB+eOU6/OwoTIExkGgNUiPWrIk1Vhuw+04rolMEqjnioLMmxkWPRQzM l9StjHzgF2CCxG7F7LQ9B7uePn2k2cnMxWoYvskwQMVMBcF+eMzZkcbx/CEeGWQ4uhDS lGBSe7OG1By85gNzFEzHYlgB385jpCrLa3HUZAtmuztfa5EOh33UCCZYsv+CyfXHMcU2 em1n7zGHtBsMbgDhydHO9PKk48ISa+//l2yEHXkA6Wu02t2NDjMwVkgu3dM3rgtFTnrK JvJp3p0WHaSlBdikHb1VLA+zKET3ND+G9AKEdfCR4yAddPUFYlgbK0hIcAIfsMAq3bGS kQ== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m0javkw99-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Nov 2022 03:06:49 -0800 Received: from twshared10308.07.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 23 Nov 2022 03:06:48 -0800 Received: by devbig038.lla2.facebook.com (Postfix, from userid 572232) id 81F2FA0804D2; Wed, 23 Nov 2022 03:06:27 -0800 (PST) From: Dylan Yudaken To: Jens Axboe , Pavel Begunkov CC: , , Dylan Yudaken Subject: [PATCH for-next v2 06/13] io_uring: simplify io_issue_sqe Date: Wed, 23 Nov 2022 03:06:07 -0800 Message-ID: <20221123110614.3297343-7-dylany@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221123110614.3297343-1-dylany@meta.com> References: <20221123110614.3297343-1-dylany@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: mlhsMtwr7LFLUAiYBQyaRsokI8ilF6nj X-Proofpoint-GUID: mlhsMtwr7LFLUAiYBQyaRsokI8ilF6nj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-23_06,2022-11-23_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org io_issue_sqe can reuse __io_req_complete for completion logic Signed-off-by: Dylan Yudaken --- io_uring/io_uring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 5a620001df2e..912f6fefc665 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1738,12 +1738,9 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) if (creds) revert_creds(creds); - if (ret == IOU_OK) { - if (issue_flags & IO_URING_F_COMPLETE_DEFER) - io_req_complete_defer(req); - else - io_req_complete_post(req); - } else if (ret != IOU_ISSUE_SKIP_COMPLETE) + if (ret == IOU_OK) + __io_req_complete(req, issue_flags); + else if (ret != IOU_ISSUE_SKIP_COMPLETE) return ret; /* If the op doesn't have a file, we're not polling for it */