From patchwork Tue Jun 14 12:29:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 12881129 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 758C7C433EF for ; Tue, 14 Jun 2022 12:34:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356350AbiFNMec (ORCPT ); Tue, 14 Jun 2022 08:34:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243825AbiFNMeA (ORCPT ); Tue, 14 Jun 2022 08:34:00 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D10174BB86 for ; Tue, 14 Jun 2022 05:30:56 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id m16-20020a7bca50000000b0039c8a224c95so3819987wml.2 for ; Tue, 14 Jun 2022 05:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aiDnDEFv3waDefowu5Uws7FQ5cxLr1/URoFOkJXGFhw=; b=WKuxUytv5fxlW+72ObSGz/d8M0pmIyboKKh+OhB7lsZVy6b3i0OtEnXFN5cfVet9GJ XpPMCikqhhY3kkujvHvHQrSvyXbl18m39IA/meDkowKH9h+vbU94Zqg4dAIrFq8GUD5M THV2jKXKxNCYZLsRwtc9GYOQ+bs4qi3OcNVjj1UO3cYJ2rHAqz/JulrAZTKPhFYctj+t iqVXPgG4SNZeDAdlkmpwFtvFbHYwuehHJAGOnG/21Drp6VP3GjipKwhgV9nmqPf+j2cI TJ9ae34L/BV0t8j//SlOLafyn92JIfE0OdheRbsU39xdq7Z8YXjZr93KBvV1JbCyToK5 zfPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aiDnDEFv3waDefowu5Uws7FQ5cxLr1/URoFOkJXGFhw=; b=T8bKmHY7e25+9gxzJN6xwPixe6SkhMqUz/JWmvJ2kGLdW56XscKDPqXNTxqiwbL49q xFwP9pnSAwhs61sEn+eUB2Jsm/D5mIljGc6JxeGIi6GPRhK2F5CpEEkZ2j2Dp46PzaE0 iLCLCMOG7kvTVKhyRY0mqymc56fE/2Z4wSPEZfutITtW0FnGQ0wfnxVvML7Ct/kJnppw q+wfSYqkLwSKz1LkoDdQ14VPLt2RB9jj3RF0YuZUBADh06YUX0FC40YSzN5D0CechbB6 t04yRSrnI0x2nwgC4cqFf2Xn+Srf+e4Ug0elKoRLNcpSKLEANB4yYRNJ3LuIO2ZD6KA/ q1Pg== X-Gm-Message-State: AOAM5323yaDP6JPruz/DpL6ildJsnpzXCDbQ1DGfdtxjMk1NuXkcCb+s RUdaq7Tvejw1GUHQXTt9+3AhvPRmpybnQQ== X-Google-Smtp-Source: ABdhPJzOUXePin1Syi7e4bfS/NBdykbFU4aCee8W3n50Bo08Ad1/HRXFqlZ1mg+5FLNWgzwbaLsH/w== X-Received: by 2002:a1c:3b56:0:b0:39c:472a:4aff with SMTP id i83-20020a1c3b56000000b0039c472a4affmr3938273wma.23.1655209855089; Tue, 14 Jun 2022 05:30:55 -0700 (PDT) Received: from 127.0.0.1localhost (188.28.125.106.threembb.co.uk. [188.28.125.106]) by smtp.gmail.com with ESMTPSA id t7-20020a05600c198700b0039c5fb1f592sm12410651wmq.14.2022.06.14.05.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jun 2022 05:30:54 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: Jens Axboe , asml.silence@gmail.com Subject: [PATCH for-next 16/25] io_uring: pass poll_find lock back Date: Tue, 14 Jun 2022 13:29:54 +0100 Message-Id: X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Instead of using implicit knowledge of what is locked or not after io_poll_find() and co returns, pass back a pointer to the locked bucket if any. If set the user must to unlock the spinlock. Signed-off-by: Pavel Begunkov --- io_uring/poll.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/io_uring/poll.c b/io_uring/poll.c index ab4be4173cf3..ad25a964d4ed 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -559,12 +559,15 @@ __cold bool io_poll_remove_all(struct io_ring_ctx *ctx, struct task_struct *tsk, } static struct io_kiocb *io_poll_find(struct io_ring_ctx *ctx, bool poll_only, - struct io_cancel_data *cd) + struct io_cancel_data *cd, + struct io_hash_bucket **out_bucket) { struct io_kiocb *req; u32 index = hash_long(cd->data, ctx->cancel_hash_bits); struct io_hash_bucket *hb = &ctx->cancel_hash[index]; + *out_bucket = NULL; + spin_lock(&hb->lock); hlist_for_each_entry(req, &hb->list, hash_node) { if (cd->data != req->cqe.user_data) @@ -576,6 +579,7 @@ static struct io_kiocb *io_poll_find(struct io_ring_ctx *ctx, bool poll_only, continue; req->cancel_seq = cd->seq; } + *out_bucket = hb; return req; } spin_unlock(&hb->lock); @@ -583,11 +587,14 @@ static struct io_kiocb *io_poll_find(struct io_ring_ctx *ctx, bool poll_only, } static struct io_kiocb *io_poll_file_find(struct io_ring_ctx *ctx, - struct io_cancel_data *cd) + struct io_cancel_data *cd, + struct io_hash_bucket **out_bucket) { struct io_kiocb *req; int i; + *out_bucket = NULL; + for (i = 0; i < (1U << ctx->cancel_hash_bits); i++) { struct io_hash_bucket *hb = &ctx->cancel_hash[i]; @@ -599,6 +606,7 @@ static struct io_kiocb *io_poll_file_find(struct io_ring_ctx *ctx, if (cd->seq == req->cancel_seq) continue; req->cancel_seq = cd->seq; + *out_bucket = hb; return req; } spin_unlock(&hb->lock); @@ -617,23 +625,19 @@ static bool io_poll_disarm(struct io_kiocb *req) int io_poll_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd) { + struct io_hash_bucket *bucket; struct io_kiocb *req; - u32 index; - spinlock_t *lock; if (cd->flags & (IORING_ASYNC_CANCEL_FD|IORING_ASYNC_CANCEL_ANY)) - req = io_poll_file_find(ctx, cd); + req = io_poll_file_find(ctx, cd, &bucket); else - req = io_poll_find(ctx, false, cd); - if (!req) { - return -ENOENT; - } else { - index = hash_long(req->cqe.user_data, ctx->cancel_hash_bits); - lock = &ctx->cancel_hash[index].lock; - } - io_poll_cancel_req(req); - spin_unlock(lock); - return 0; + req = io_poll_find(ctx, false, cd, &bucket); + + if (req) + io_poll_cancel_req(req); + if (bucket) + spin_unlock(&bucket->lock); + return req ? 0 : -ENOENT; } static __poll_t io_poll_parse_events(const struct io_uring_sqe *sqe, @@ -726,19 +730,21 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags) struct io_poll_update *poll_update = io_kiocb_to_cmd(req); struct io_cancel_data cd = { .data = poll_update->old_user_data, }; struct io_ring_ctx *ctx = req->ctx; - u32 index = hash_long(cd.data, ctx->cancel_hash_bits); - spinlock_t *lock = &ctx->cancel_hash[index].lock; + struct io_hash_bucket *bucket; struct io_kiocb *preq; int ret2, ret = 0; bool locked; - preq = io_poll_find(ctx, true, &cd); + preq = io_poll_find(ctx, true, &cd, &bucket); + if (preq) + ret2 = io_poll_disarm(preq); + if (bucket) + spin_unlock(&bucket->lock); + if (!preq) { ret = -ENOENT; goto out; } - ret2 = io_poll_disarm(preq); - spin_unlock(lock); if (!ret2) { ret = -EALREADY; goto out;