From nobody Tue Sep 9 22:30:29 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28DE6C04FDF for ; Wed, 26 Jul 2023 14:13:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233598AbjGZONg (ORCPT ); Wed, 26 Jul 2023 10:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233272AbjGZOL7 (ORCPT ); Wed, 26 Jul 2023 10:11:59 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DC6B2704 for ; Wed, 26 Jul 2023 07:11:26 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 15E5142479 for ; Wed, 26 Jul 2023 14:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690380658; bh=dyH4eLS/ZCdAMtA+4CRaXqW6UBtXDh7SsBX0oiAwXGM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uzUnLwoq8VJYmmEbeMrpUxaq3Zfz5TsanBPbw4eug/TWexfBrJw+XNoMHEmwRI6eC dBAuGn1ZF8ZKg9wDSL3ATbW4XzjKD1/T24CIQ8imZknw5/Fy1k84bTF59A2EPluO2e nTODKJuQZBQDly13NB0vU9UG/hr8lxGDzVXOo+MXComlR/5GZcZHbLI7K/vm+5+IRx ZA551k1KF3E34Acjil1ql+etItIatlC9xTxcBB1n08rAsW7gjmVd2Jn1ISBq2L3bzr fNFhEIT6L94LPSR1AgJwWTbtfAXmTrNg6Tdc7OoOP6nmhoejngnHzfbMUHjtxE07FF 3uIB/Ai17EhwQ== Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3fbe590234aso40283395e9.1 for ; Wed, 26 Jul 2023 07:10:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690380656; x=1690985456; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dyH4eLS/ZCdAMtA+4CRaXqW6UBtXDh7SsBX0oiAwXGM=; b=P+ORP975R42l4pG9Dy+kaIoNj5Ow+pS+L5JxCgdy6NXvdCVxA4wXzywji+y0au6qCZ 0Y2Dbmg1itiTu1s3VsoIlc/ho/aIrtuSQVQffVMrKZngshNDdsMWaSxL0XaKL4onsr5y DE2HkQFlxndmbRGmwblFi2wTlR5/on09Nnd8e0LOqT37Zeq+TYz6MhRikaYsoh7qqmUB eiJjSdJDB3Jbyxnybru+Fbz7sus6Oyut70Y1je8/wjV3Gm00rOOMAEU5x+j8Gr4pCYxf jtMqtATw+G1YdadEEs/TrJ1S/nBHx/o08pGdRbnv7Mi7QQiTO3/UpFtoVtgEFurkahU6 Fkug== X-Gm-Message-State: ABy/qLaZ2OrPYG9KpHTK0IEd3frt7f788CvdkOjehd0lK+5GLzVBxob9 K60/0mKuTL6mL4/SBpbMHj8zy6vo7KGNNah7wFA3YFGKnxdKdphaJIxm6NTxO9btfa8xjO8gGp4 g1dO7uG8RqAw6Eoq9Wzk0ERFH5Gngal0D4qAGP3wMWQ== X-Received: by 2002:a7b:c3d9:0:b0:3fc:855:db42 with SMTP id t25-20020a7bc3d9000000b003fc0855db42mr1517995wmj.34.1690380656674; Wed, 26 Jul 2023 07:10:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlH7igXsZCdDZ+9aNp4I+OUG6/RPWtxjCijXvhNNhLiLg/iak67y70pTTfQ0BN6X+GC66gvhgQ== X-Received: by 2002:a7b:c3d9:0:b0:3fc:855:db42 with SMTP id t25-20020a7bc3d9000000b003fc0855db42mr1517986wmj.34.1690380656489; Wed, 26 Jul 2023 07:10:56 -0700 (PDT) Received: from amikhalitsyn.local (dslb-088-066-182-192.088.066.pools.vodafone-ip.de. [88.66.182.192]) by smtp.gmail.com with ESMTPSA id k14-20020a7bc30e000000b003fc02219081sm2099714wmj.33.2023.07.26.07.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 07:10:56 -0700 (PDT) From: Alexander Mikhalitsyn To: xiubli@redhat.com Cc: brauner@kernel.org, stgraber@ubuntu.com, linux-fsdevel@vger.kernel.org, Jeff Layton , Ilya Dryomov , ceph-devel@vger.kernel.org, Christian Brauner , Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v7 10/11] ceph/file: allow idmapped atomic_open inode op Date: Wed, 26 Jul 2023 16:10:25 +0200 Message-Id: <20230726141026.307690-11-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230726141026.307690-1-aleksandr.mikhalitsyn@canonical.com> References: <20230726141026.307690-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christian Brauner Enable ceph_atomic_open() to handle idmapped mounts. This is just a matter of passing down the mount's idmapping. Cc: Xiubo Li Cc: Jeff Layton Cc: Ilya Dryomov Cc: ceph-devel@vger.kernel.org Signed-off-by: Christian Brauner [ adapted to 5fadbd9929 ("ceph: rely on vfs for setgid stripping") ] Signed-off-by: Alexander Mikhalitsyn --- v4: - call mnt_idmap_get --- fs/ceph/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 7470daafe595..f73d8b760682 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -668,7 +668,9 @@ static int ceph_finish_async_create(struct inode *dir, = struct inode *inode, in.truncate_seq =3D cpu_to_le32(1); in.truncate_size =3D cpu_to_le64(-1ULL); in.xattr_version =3D cpu_to_le64(1); - in.uid =3D cpu_to_le32(from_kuid(&init_user_ns, current_fsuid())); + in.uid =3D cpu_to_le32(from_kuid(&init_user_ns, + mapped_fsuid(req->r_mnt_idmap, + &init_user_ns))); if (dir->i_mode & S_ISGID) { in.gid =3D cpu_to_le32(from_kgid(&init_user_ns, dir->i_gid)); =20 @@ -676,7 +678,9 @@ static int ceph_finish_async_create(struct inode *dir, = struct inode *inode, if (S_ISDIR(mode)) mode |=3D S_ISGID; } else { - in.gid =3D cpu_to_le32(from_kgid(&init_user_ns, current_fsgid())); + in.gid =3D cpu_to_le32(from_kgid(&init_user_ns, + mapped_fsgid(req->r_mnt_idmap, + &init_user_ns))); } in.mode =3D cpu_to_le32((u32)mode); =20 @@ -743,6 +747,7 @@ static int ceph_finish_async_create(struct inode *dir, = struct inode *inode, int ceph_atomic_open(struct inode *dir, struct dentry *dentry, struct file *file, unsigned flags, umode_t mode) { + struct mnt_idmap *idmap =3D file_mnt_idmap(file); struct ceph_fs_client *fsc =3D ceph_sb_to_fs_client(dir->i_sb); struct ceph_client *cl =3D fsc->client; struct ceph_mds_client *mdsc =3D fsc->mdsc; @@ -802,6 +807,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *= dentry, mask |=3D CEPH_CAP_XATTR_SHARED; req->r_args.open.mask =3D cpu_to_le32(mask); req->r_parent =3D dir; + req->r_mnt_idmap =3D mnt_idmap_get(idmap); ihold(dir); if (IS_ENCRYPTED(dir)) { set_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags); --=20 2.34.1