mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christian Brauner <brauner@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christian Brauner <brauner@kernel.org>,
	Amir Goldstein <amir73il@gmail.com>,
	Miklos Szeredi <miklos@szeredi.hu>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 22/26] io_uring: avoid pointless cred reference count bump
Date: Sun, 24 Nov 2024 14:44:08 +0100	[thread overview]
Message-ID: <20241124-work-cred-v1-22-f352241c3970@kernel.org> (raw)
In-Reply-To: <20241124-work-cred-v1-0-f352241c3970@kernel.org>

No need for the extra reference count bump.

Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 io_uring/io_uring.c | 4 ++--
 io_uring/sqpoll.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index ad4d8e94a8665cf5f3e9ea0fd9bc6c03a03cc48f..8012933998837ddcef45c14f1dfe543947a9eaec 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1704,7 +1704,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
 		return -EBADF;
 
 	if (unlikely((req->flags & REQ_F_CREDS) && req->creds != current_cred()))
-		creds = override_creds(get_new_cred(req->creds));
+		creds = override_creds(req->creds);
 
 	if (!def->audit_skip)
 		audit_uring_entry(req->opcode);
@@ -1715,7 +1715,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
 		audit_uring_exit(!ret, ret);
 
 	if (creds)
-		put_cred(revert_creds(creds));
+		revert_creds(creds);
 
 	if (ret == IOU_OK) {
 		if (issue_flags & IO_URING_F_COMPLETE_DEFER)
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 1ca96347433695de1eb0e3bec7c6da4299e9ceb0..6df5e649c413e39e36db6cde2a8c6745e533bea9 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -174,7 +174,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
 		const struct cred *creds = NULL;
 
 		if (ctx->sq_creds != current_cred())
-			creds = override_creds(get_new_cred(ctx->sq_creds));
+			creds = override_creds(ctx->sq_creds);
 
 		mutex_lock(&ctx->uring_lock);
 		if (!wq_list_empty(&ctx->iopoll_list))
@@ -192,7 +192,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
 		if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait))
 			wake_up(&ctx->sqo_sq_wait);
 		if (creds)
-			put_cred(revert_creds(creds));
+			revert_creds(creds);
 	}
 
 	return ret;

-- 
2.45.2


  parent reply	other threads:[~2024-11-24 13:45 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-22  9:57 [GIT PULL] overlayfs updates for 6.13 Amir Goldstein
2024-11-23  5:21 ` Linus Torvalds
2024-11-23  5:22   ` Linus Torvalds
2024-11-23  6:09   ` Linus Torvalds
2024-11-23  6:14     ` Al Viro
2024-11-23 17:18       ` Linus Torvalds
2024-11-23 12:06   ` Christian Brauner
2024-11-23 17:29     ` Linus Torvalds
2024-11-24 13:43       ` [PATCH 00/26] cred: rework {override,revert}_creds() Christian Brauner
2024-11-24 13:43         ` [PATCH 01/26] tree-wide: s/override_creds()/override_creds_light(get_new_cred())/g Christian Brauner
2024-11-24 13:43         ` [PATCH 02/26] cred: return old creds from revert_creds_light() Christian Brauner
2024-11-24 13:43         ` [PATCH 03/26] tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g Christian Brauner
2024-11-24 13:43         ` [PATCH 04/26] cred: remove old {override,revert}_creds() helpers Christian Brauner
2024-11-24 13:43         ` [PATCH 05/26] tree-wide: s/override_creds_light()/override_creds()/g Christian Brauner
2024-11-24 13:43         ` [PATCH 06/26] tree-wide: s/revert_creds_light()/revert_creds()/g Christian Brauner
2024-11-24 13:43         ` [PATCH 07/26] firmware: avoid pointless reference count bump Christian Brauner
2024-11-24 14:56           ` Amir Goldstein
2024-11-24 13:43         ` [PATCH 08/26] sev-dev: avoid pointless cred " Christian Brauner
2024-11-24 18:19           ` Al Viro
2024-11-24 13:43         ` [PATCH 09/26] target_core_configfs: " Christian Brauner
2024-11-24 18:26           ` Al Viro
2024-11-25 11:31             ` Christian Brauner
2024-11-24 13:43         ` [PATCH 10/26] aio: " Christian Brauner
2024-11-24 13:43         ` [PATCH 11/26] binfmt_misc: " Christian Brauner
2024-11-24 13:43         ` [PATCH 12/26] coredump: " Christian Brauner
2024-11-24 13:43         ` [PATCH 13/26] nfs/localio: avoid pointless cred reference count bumps Christian Brauner
2024-11-24 13:44         ` [PATCH 14/26] nfs/nfs4idmap: avoid pointless reference count bump Christian Brauner
2024-11-24 13:44         ` [PATCH 15/26] nfs/nfs4recover: avoid pointless cred " Christian Brauner
2024-11-25 13:10           ` Chuck Lever
2024-11-24 13:44         ` [PATCH 16/26] nfsfh: " Christian Brauner
2024-11-25 13:11           ` Chuck Lever
2024-11-24 13:44         ` [PATCH 17/26] open: " Christian Brauner
2024-11-24 13:44         ` [PATCH 18/26] ovl: " Christian Brauner
2024-11-24 14:59           ` Amir Goldstein
2024-11-25 11:30             ` Christian Brauner
2024-11-24 13:44         ` [PATCH 19/26] cifs: " Christian Brauner
2024-11-24 13:44         ` [PATCH 20/26] " Christian Brauner
2024-11-24 13:44         ` [PATCH 21/26] smb: " Christian Brauner
2024-11-24 18:37           ` Al Viro
2024-11-25 11:22             ` Christian Brauner
2024-11-24 13:44         ` Christian Brauner [this message]
2024-11-24 13:44         ` [PATCH 23/26] acct: avoid pointless " Christian Brauner
2024-11-24 13:44         ` [PATCH 24/26] cgroup: avoid pointless cred " Christian Brauner
2024-11-24 13:44         ` [PATCH 25/26] trace: " Christian Brauner
2024-11-24 13:44         ` [PATCH 26/26] dns_resolver: " Christian Brauner
2024-11-24 17:00         ` [PATCH 00/26] cred: rework {override,revert}_creds() Amir Goldstein
2024-11-24 18:00         ` Linus Torvalds
2024-11-25 11:46           ` Christian Brauner
2024-11-25 12:55           ` Amir Goldstein
2024-11-25 14:13             ` Christian Brauner
2024-11-25 13:51         ` Jeff Layton
2024-11-23 18:47     ` [GIT PULL] overlayfs updates for 6.13 Christian Brauner
2024-11-23  5:57 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241124-work-cred-v1-22-f352241c3970@kernel.org \
    --to=brauner@kernel.org \
    --cc=amir73il@gmail.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®