From patchwork Mon Oct 24 11:32:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp625940wru; Mon, 24 Oct 2022 12:55:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7tiurCEt7CD65zV9x1AI2kKjQao+1KpRroHbqhHIg3GN/EsciTbS2Piadx5ROPM30R1NNC X-Received: by 2002:a17:90a:8988:b0:212:e1b9:e8fd with SMTP id v8-20020a17090a898800b00212e1b9e8fdmr15934382pjn.148.1666641340101; Mon, 24 Oct 2022 12:55:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666641340; cv=none; d=google.com; s=arc-20160816; b=vv/Fu9TYGsh/jBQtpYyc5EzATg6nR6DmaoNDGMZ9uGrrPMl2TymSZI1cynrCuvkCS2 DcQ7he+9s8S6L4p+ijEhWoO166M6y8kSnG5uZRoK7YPW+tDLAtXK1At0Jr8VXptdV5o/ TSGisNT1skZdJPB+ttjwtf9SIC9bGokRHUexlJ36Pb34qzo9QC44o9T0fzq8VLDAL6Fe 21q5wcvrwTp/HihWYYYggZUYPCN/tTzmct6c71eHtIBG9S+gLWKYlWYuGEWhSOYj4dHy M+y0U14fuqAQ4E8V1gZK68q3i21kyD5U04acue7F8oQYAWxlhpUYq/7/bMKikn96laXT CkBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TSaJLsL+ZvVATr7B9nv92vFsyQa8oprEds1ZUWvlVqs=; b=LD0IDxqat9uFMlBDCnKKbv+GDVWqOjPwBIrDH50niQo+TaTP2OChTWvCy4xqXgDopZ 3MkhgwVWWKXwA2se4FBW5I8PhoOkykml18tealH/5/+hcsx1UoXYaxJ/WhWOjclq7Xme U+NIuQha2To27FOgFNvSXn2iom3IQbunGDy4noWIKC+xUwMwixxC/1ugpdXRVv+MjXBU lE3DFfnrJ7H7uD4n4yU8g8/Y+/L6awm18PbJM28eSt9AhO/DSblmoeRUOCOnmF+sVbWT sRUd+fBc/FAmpNrOiv5BO0lnOf0+VEep30zX3gnQfTNE0bI7LAiycfVxt+q1Kds5l36V EhDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ixUI3Vuo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t3-20020a62d143000000b0053708adb535si516618pfl.257.2022.10.24.12.55.25; Mon, 24 Oct 2022 12:55:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ixUI3Vuo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233655AbiJXTyx (ORCPT + 99 others); Mon, 24 Oct 2022 15:54:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233427AbiJXTxP (ORCPT ); Mon, 24 Oct 2022 15:53:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D39E12DE1; Mon, 24 Oct 2022 11:17:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4B2DDB8171F; Mon, 24 Oct 2022 12:32:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3999C433D7; Mon, 24 Oct 2022 12:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614749; bh=lRex0KZaajbNq/rIhcn4HcwjpNYtfESEz/jQaZV8qrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ixUI3Vuo07ySv1W6cY1htQuTA8EYybuFF7HBDmPUAml68lxW/0BGIWcWs4gvhJQ8W 2iqh7Bizgsnqg3w5i659nFAFbBF5RH14iPOnkDTmK3f+Y9OoDfF5ewQ+XZIS0alZOk zcTnK2YfPqGyx4DbhWwpBfUBE44QR93oUYWWYdu4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Stable@vger.kernel.org, Pavel Begunkov , Jens Axboe Subject: [PATCH 5.10 378/390] io_uring: correct pinned_vm accounting Date: Mon, 24 Oct 2022 13:32:55 +0200 Message-Id: <20221024113039.072215330@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747600109892552733?= X-GMAIL-MSGID: =?utf-8?q?1747600109892552733?= From: Pavel Begunkov [ upstream commit 42b6419d0aba47c5d8644cdc0b68502254671de5 ] ->mm_account should be released only after we free all registered buffers, otherwise __io_sqe_buffers_unregister() will see a NULL ->mm_account and skip locked_vm accounting. Cc: Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/6d798f65ed4ab8db3664c4d3397d4af16ca98846.1664849932.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/io_uring.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8436,8 +8436,6 @@ static void io_ring_ctx_free(struct io_r if (ctx->sqo_task) { put_task_struct(ctx->sqo_task); ctx->sqo_task = NULL; - mmdrop(ctx->mm_account); - ctx->mm_account = NULL; } #ifdef CONFIG_BLK_CGROUP @@ -8456,6 +8454,11 @@ static void io_ring_ctx_free(struct io_r } #endif + if (ctx->mm_account) { + mmdrop(ctx->mm_account); + ctx->mm_account = NULL; + } + io_mem_free(ctx->rings); io_mem_free(ctx->sq_sqes);