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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,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 9CB36C433DF for ; Tue, 26 May 2020 06:43:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72A86207D8 for ; Tue, 26 May 2020 06:43:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727088AbgEZGnp (ORCPT ); Tue, 26 May 2020 02:43:45 -0400 Received: from out30-56.freemail.mail.aliyun.com ([115.124.30.56]:37018 "EHLO out30-56.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726756AbgEZGnp (ORCPT ); Tue, 26 May 2020 02:43:45 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01358;MF=xiaoguang.wang@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0TzhHCNk_1590475419; Received: from localhost(mailfrom:xiaoguang.wang@linux.alibaba.com fp:SMTPD_---0TzhHCNk_1590475419) by smtp.aliyun-inc.com(127.0.0.1); Tue, 26 May 2020 14:43:41 +0800 From: Xiaoguang Wang To: io-uring@vger.kernel.org Cc: axboe@kernel.dk, asml.silence@gmail.com, joseph.qi@linux.alibaba.com, Xiaoguang Wang Subject: [PATCH 1/3] io_uring: don't use req->work.creds for inline requests Date: Tue, 26 May 2020 14:43:28 +0800 Message-Id: <20200526064330.9322-1-xiaoguang.wang@linux.alibaba.com> X-Mailer: git-send-email 2.17.2 Sender: io-uring-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org In io_init_req(), if uers requires a new credentials, currently we'll save it in req->work.creds, but indeed io_wq_work is designed to describe needed running environment for requests that will go to io-wq, if one request is going to be submitted inline, we'd better not touch io_wq_work. Here add a new 'const struct cred *creds' in io_kiocb, if uers requires a new credentials, inline requests can use it. This patch is also a preparation for later patch. Signed-off-by: Xiaoguang Wang --- fs/io_uring.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 2af87f73848e..788d960abc69 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -635,6 +635,7 @@ struct io_kiocb { unsigned int flags; refcount_t refs; struct task_struct *task; + const struct cred *creds; unsigned long fsize; u64 user_data; u32 result; @@ -1035,8 +1036,10 @@ static inline void io_req_work_grab_env(struct io_kiocb *req, mmgrab(current->mm); req->work.mm = current->mm; } - if (!req->work.creds) + if (!req->creds) req->work.creds = get_current_cred(); + else + req->work.creds = get_cred(req->creds); if (!req->work.fs && def->needs_fs) { spin_lock(¤t->fs->lock); if (!current->fs->in_exec) { @@ -1368,6 +1371,9 @@ static void __io_req_aux_free(struct io_kiocb *req) if (req->flags & REQ_F_NEED_CLEANUP) io_cleanup_req(req); + if (req->creds) + put_cred(req->creds); + kfree(req->io); if (req->file) io_put_file(req, req->file, (req->flags & REQ_F_FIXED_FILE)); @@ -5673,13 +5679,13 @@ static void __io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe) again: linked_timeout = io_prep_linked_timeout(req); - if (req->work.creds && req->work.creds != current_cred()) { + if (req->creds && req->creds != current_cred()) { if (old_creds) revert_creds(old_creds); - if (old_creds == req->work.creds) + if (old_creds == req->creds) old_creds = NULL; /* restored original creds */ else - old_creds = override_creds(req->work.creds); + old_creds = override_creds(req->creds); } ret = io_issue_sqe(req, sqe, true); @@ -5970,11 +5976,12 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, id = READ_ONCE(sqe->personality); if (id) { - req->work.creds = idr_find(&ctx->personality_idr, id); - if (unlikely(!req->work.creds)) + req->creds = idr_find(&ctx->personality_idr, id); + if (unlikely(!req->creds)) return -EINVAL; - get_cred(req->work.creds); - } + get_cred(req->creds); + } else + req->creds = NULL; /* same numerical values with corresponding REQ_F_*, safe to copy */ req->flags |= sqe_flags; -- 2.17.2