Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp2696989ybb; Sun, 5 Apr 2020 14:15:38 -0700 (PDT) X-Google-Smtp-Source: APiQypJZdW1glIh3s8c4I6yFyLiB2PaniokdYL4Mjp0Wu40vW4Lwm14gvt8cYAIR4Dl7oZZ2UIef X-Received: by 2002:a9d:8f3:: with SMTP id 106mr14995721otf.328.1586121338113; Sun, 05 Apr 2020 14:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586121338; cv=none; d=google.com; s=arc-20160816; b=gxPumZSpFDNZhK2k7kiSQ5SC8lAkN766YbEYSABRou/wVBkuPcE9ylZeuUavLSkwWW jgOuZ39r3UDH+L59AoOTvemWJzof1kaB9a7dP0lj1Qu5glvwKRidXEzmNvUA2Kg/pYBL TS2QFhfBUx3zBSW+j9RA/o1hmzK6F1gI9TDhyZDzOmn4eMq5ixzzykJ0GAryEbxLHyuR kOHQpgB1mYsE/cheY7tBtusTFcuUXcmACv+WIhWmJABMqAiB+QcGwT88Hfc49nPlmPIJ UOi5Tqwo1ientBvQBHNk3FEvvytJBKSqn1tM+hnEbsIQuVMVlv1O1BJO/mG/w2tHOFNV gO8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=lSOKc+HQI/g1UnrgTsNvtmUHVD7LObr5lhFzq0FRBR0=; b=xMMCHlCj4AoO7xcIyoL/uydoeih5EyAizx1ER1mVry2ymoxgfPyJZCPLAbUJWp1u/f eTJMZzyIssNuTiN85tMgOREqN3eHuiVXssMxNAvlcWJ22ej4qjpGhasTYZ7l5HUUviGx HpFmRH/6ehLuldyT/shbpBq1+RzJXk/FK58nUClNAjscEoLou3pUqD6une3fsB+5vt9T ALcUYk7MNd9K8/BDN8/ev3UHjFO00Xxc+x6nHZIBykHZ8fZlFpfwFtJV2hV2+XUQk2Gn tM8qMe/CruRLlniky2RdwR7qFaXuaXxK8GB9k4Yr0jzpth8hoOvCraVbCbHSB/ZMxkz2 ZTyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=s+tZRGxP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k25si6520314oik.162.2020.04.05.14.15.23; Sun, 05 Apr 2020 14:15:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=s+tZRGxP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727801AbgDEVKB (ORCPT + 99 others); Sun, 5 Apr 2020 17:10:01 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53119 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbgDEVKB (ORCPT ); Sun, 5 Apr 2020 17:10:01 -0400 Received: by mail-wm1-f66.google.com with SMTP id t203so4179354wmt.2; Sun, 05 Apr 2020 14:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=lSOKc+HQI/g1UnrgTsNvtmUHVD7LObr5lhFzq0FRBR0=; b=s+tZRGxPyr7Np+lIw0qzvmoe2fAmJ2YUCw+6fE5AHahZi1aDh+KDchydSTJbBLZep9 VzjA4Vb/qtpkcGZols3+8psvwqqWmmG9+ksBU5IOtOoXwxlRem9B486BeFRFa+2iu6YR en4dd+CKxiAS3TWvcW07VJzV+E4HHXpKHwUDvOTWtSWzlgkp/cfik0NbpxMubqsspeJs 2zwq825FH1xWMwKbpfCGHIAO0F3cIALjuZd2bq5m2/hby0BK7OaRFKz1xFWlciDyfTGW hBn66bmS8H/mLdD9h/Gr1a8ezVwpCikVJBJuY/k2Mjp1GpVVv2odIbcHwTsZOynDCsgB 72BA== 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:mime-version :content-transfer-encoding; bh=lSOKc+HQI/g1UnrgTsNvtmUHVD7LObr5lhFzq0FRBR0=; b=hzBrCIW7rNrXqAp2+3eBp6xocpkmlHOgqIlHVdJxzjRzVmLhjqTIYeoxtsr1rDgGow GBC5A+qcGLsHHtMPUxVAqEQJKWuATNQgDbdR2MJJuuco/qFz7MF6Mlas3H52F/jO5BVd Q6UdXQaOLaYCfNA9wGHcGi6tENdv/h5gU/sQTNpL4+jIwNTZ8MtPo3tHhzvcT5F/FtrH x9KJjjKevm4lc+XNvUUgY1QCCbx+cDnR9r0CZtch4cEMo73c7u8gwiZ4K3vtjr4avP6B 3UjxCUii3N2u/OFd+FaxII4CRlhWQGv63EMrj5FOhCKw9fqMzbGPUna831egtKNYUUnu VEJg== X-Gm-Message-State: AGi0PubKiJo7M6uRo4YOaz4cC8KxH+9ASoHCuaJEW0KffQd9CjUqOL0n 0cc9tBKfdG5TZ2pM5X53jhbozdyT X-Received: by 2002:a1c:6a14:: with SMTP id f20mr18386952wmc.125.1586120998987; Sun, 05 Apr 2020 14:09:58 -0700 (PDT) Received: from localhost.localdomain ([109.126.129.227]) by smtp.gmail.com with ESMTPSA id f1sm24493791wrv.37.2020.04.05.14.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 14:09:58 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] io_uring: fix ctx refcounting in io_submit_sqes() Date: Mon, 6 Apr 2020 00:08:52 +0300 Message-Id: <8b53ce4539784423b493fdbfae9bd4c720b24d2a.1586120916.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.24.0 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 If io_get_req() fails, it drops a ref. Then, awhile keeping @submitted unmodified, io_submit_sqes() breaks the loop and puts @nr - @submitted refs. For each submitted req a ref is dropped in io_put_req() and friends. So, for @nr taken refs there will be (@nr - @submitted + @submitted + 1) dropped. Remove ctx refcounting from io_get_req(), that at the same time makes it clearer. Fixes: 2b85edfc0c90 ("io_uring: batch getting pcpu references") Signed-off-by: Pavel Begunkov --- fs/io_uring.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 78ae8e8ed5bf..79bd22289d73 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1342,7 +1342,6 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx, req = io_get_fallback_req(ctx); if (req) goto got_it; - percpu_ref_put(&ctx->refs); return NULL; } -- 2.24.0