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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1213DC433E0 for ; Tue, 26 May 2020 17:36:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4F0720704 for ; Tue, 26 May 2020 17:36:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Psm6/u9J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389387AbgEZRgH (ORCPT ); Tue, 26 May 2020 13:36:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389243AbgEZRfp (ORCPT ); Tue, 26 May 2020 13:35:45 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49623C03E96D; Tue, 26 May 2020 10:35:45 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id nr22so8370588ejb.6; Tue, 26 May 2020 10:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cF/H22IrH4Q++fp1tOhrxsdESk3Jt5D36vD3e1cvXpU=; b=Psm6/u9JyWiod1LQIXrR0p6geR/OTP/AXtstHIqJ2z5f4vmvyHd8/hyNWBC1LQpCWk eMuyrvCGP4XwfEymacF1sxMOGa6ckZOHvjAdEtnQVRUojgj57TDZ5Ibbizufk2jOoOKU nboqv2csyoPVN21/GJYoKRlE+M03MyBi6jT4IfjbYHR4QKhsHNYkojDWpU9L0goJbn4G 530wcFy+P31pZBLHwSmBaG56Uc2lia+61IKvFurGtcFusOxFDsQaWkwkSak0gcxnz0yV uqRKQWRtA0ok3Po5baAFT3YSVDbXQyirfeVXbBcBWG4o4F/uX0mD6nPg1Eyolv5tfhWD RFRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cF/H22IrH4Q++fp1tOhrxsdESk3Jt5D36vD3e1cvXpU=; b=cNKKT/KrghBMKubsxyNLWcT/CnFp+7yYYrwTHvtNMQhPEfenKsC1niV2FZTeYO54Qm S8tgKHdkWRiME3VslhmrTghh8RFstNKSXhitmUsxmpbgDRW7SSon+3lhAEactZZ+60dm LNjbxI2dEVDBrEQa/SQNxoDIOBlQj/DyTwaaQz37xB+YA5xS9SWpPkbQwKqAxzzgbzDm oqyWmabphJqK1ugyKfBfQ1bxEAxpZPY/MRM5jXdE976awkyBqdI84SK0TDqi3os3CNoU /KmpGbWOgZC5ygwxDzCq5x2Kzij78BFtvs4fKTaq3UY26TZbSW4vA/NJvsUJKIY86MQE Xsmg== X-Gm-Message-State: AOAM532PXnGUAYZN5yNbYPPzdSVX+rtQ09qYIqNFRjbfW3V6pff7zadv BwiGz7Tgy6H4P8q3HPpsspU= X-Google-Smtp-Source: ABdhPJytD61Yw291LkD8z776m83gt45LaQp113EgOfSPIqZRJ+7XU7Du+iRwX5pYRp6NKP6f3LdWfw== X-Received: by 2002:a17:906:944e:: with SMTP id z14mr2051658ejx.86.1590514543968; Tue, 26 May 2020 10:35:43 -0700 (PDT) Received: from localhost.localdomain ([5.100.193.151]) by smtp.gmail.com with ESMTPSA id bz8sm391326ejc.94.2020.05.26.10.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 10:35:43 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] io_uring: simplify io_timeout locking Date: Tue, 26 May 2020 20:34:03 +0300 Message-Id: X-Mailer: git-send-email 2.24.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move spin_lock_irq() earlier to have only 1 call site of it in io_timeout(). It makes the flow easier. Signed-off-by: Pavel Begunkov --- fs/io_uring.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 42b5603ee410..e30fc17dd268 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4845,6 +4845,7 @@ static int io_timeout(struct io_kiocb *req) u32 seq = req->sequence; data = &req->io->timeout; + spin_lock_irq(&ctx->completion_lock); /* * sqe->off holds how many events that need to occur for this @@ -4853,7 +4854,6 @@ static int io_timeout(struct io_kiocb *req) */ if (!count) { req->flags |= REQ_F_TIMEOUT_NOSEQ; - spin_lock_irq(&ctx->completion_lock); entry = ctx->timeout_list.prev; goto add; } @@ -4864,7 +4864,6 @@ static int io_timeout(struct io_kiocb *req) * Insertion sort, ensuring the first entry in the list is always * the one we need first. */ - spin_lock_irq(&ctx->completion_lock); list_for_each_prev(entry, &ctx->timeout_list) { struct io_kiocb *nxt = list_entry(entry, struct io_kiocb, list); unsigned nxt_seq; -- 2.24.0