From patchwork Fri Jun 9 09:31:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 105519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp847719vqr; Fri, 9 Jun 2023 03:33:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5TOh82hdT6PQvr8yLVeCgrbjPKXlxreJdK6L34NYhYsNW/pOSptDoET2uyHeZFgvVg/bQg X-Received: by 2002:a05:6a20:7fa4:b0:10f:8499:1b75 with SMTP id d36-20020a056a207fa400b0010f84991b75mr668445pzj.9.1686306829485; Fri, 09 Jun 2023 03:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686306829; cv=none; d=google.com; s=arc-20160816; b=zIxJWubW9csPJuxmDdkxNjASbzhuVZpNU1Np2B8orWYPbXuTblbkll8ca9ULfpHVlU u6EZAgWgnH3GLP2fpaR/E/XyCverUf5lekKLkz6fhZolA91fHyhAksLV7c1Aucdm7y4d +V9vsiA5L3hZPuwC2zRuxhNjZ1UyL/pIAp/1Y/TUb7mg7njC3b+pbCUWY4MtaJEUj7MH Hjtnb2i7ND9O3gnZrF/E1yZJKq2Cva/5DMtvSGmKNxUcK7tXTfm7cpzxDdXiEbm+G5/5 PuFAHUin2Fr9qAS/AnTFRmxcQ6YMDjth0B0l5GWZyXfgBsc9IWuw9ZGyMc4WnUUq/ANk RG2A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0OC8c+cJXxBkdMyTeJgnYb4yY2v9uQR7p5VsG0G1Yao=; b=wvpYEACawXh4rY+JU/fNT3WgWgNjLACnZwGzDTSanxeFcDGe+uowt52wdB4SyPiRnd f9JT5VLtTpl0fUDKNjnYpn/UBTtzq8t1vP8NJf4Q8YNOS9AGpiWCYT08c46Yw7Ktfvi6 Pgxstcf23tDz3HFgY4NYFbm0pOlZoeUkEMYctk6AMVbl2uVXU6BwFOM+h6/VbhBKWtPc iae9f/rGatMI9t3KPMVpfBnyYQ4nSe6wAworGjon0decARRCYKuO3qdVCIUKAJW+FxlC 8QNFzqZPKapeyvJKfkNyiLUuyZQxKsY8U9KC8hUzwpk5FtUqyuyNw7qjrvAP2YAtnB5U 8Kog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=iGsR+zJj; 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=canonical.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a633749000000b005344b60f7ddsi2418000pgn.117.2023.06.09.03.33.34; Fri, 09 Jun 2023 03:33:49 -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=@canonical.com header.s=20210705 header.b=iGsR+zJj; 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=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240249AbjFIKJe (ORCPT + 99 others); Fri, 9 Jun 2023 06:09:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237810AbjFIKJC (ORCPT ); Fri, 9 Jun 2023 06:09:02 -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 8A6714ED2 for ; Fri, 9 Jun 2023 02:58:49 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 2BA693F575 for ; Fri, 9 Jun 2023 09:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1686303179; bh=0OC8c+cJXxBkdMyTeJgnYb4yY2v9uQR7p5VsG0G1Yao=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iGsR+zJjO6xJanW7jQ9NlTtl0KdQpw1sgXqlFm8xJNBGTy3jAeMXCSd0WC1EVhAbv umpkY8weHs6ERd7RVwwE//EYamKhQ3vhg9LpolbCsTqUSvMxx/FGBh9lyWgNhtuKht pStgX4dselVHz93TYMq07qDqyFAvHAohm0pbNFHtO/2rKaSAzHieTVwyLnqXOrChzt 3Zr/B/fy1Ox+vV+x5bVuiYUpxdxQyPHM2ll+Mz4LakufXvu0xcR+LQok+XZaoQx6Bw Fs6cvfKq8rMi7kkX4REpAEMgvwW9fWp4jJpMZ2tytG/qAlz0cLA+R9/lK04kf56faw 9u8CLz3z8SkGA== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a35b0d4ceso151200066b.3 for ; Fri, 09 Jun 2023 02:32:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686303178; x=1688895178; 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=0OC8c+cJXxBkdMyTeJgnYb4yY2v9uQR7p5VsG0G1Yao=; b=e9NgoZIs7Mlfb9oKeByRk5u4Xl4XmlCaD1AjikJCWhj4IhZ+ijcnCRqsBVkPb+FdVp uRwFHTesT+BkifFk0ulu5ZoKHOhXsIFlbmQLbrJFqNeOZ4flIM6+XCCy168Zgwmrpmf5 qhjZEC8Iu9Z+iAwn4jMTilhrZKQF9KKxxNWgLyT/LdjWcvhrQPNrFjwlcl19zApoiiq+ 46/202AIcnNss0VkYGb2/CJ3MN1PCpwwIeLhYdYGr1/FagebyJk1E0ruMMw54ocYdtlD v026q3IVKzRH0+C8UZ27qXE9AFVB/oaJPsBkT95Ib0TZyk7Sp3rq0tk+JaJfeo9z6aF0 Ld3g== X-Gm-Message-State: AC+VfDyUSoioeu3LsKGaVRMFT8ST02YaxE/PmQnt+lKq8gcF5De/G8RL lExzyHf2KN9hn4/7PycWsOKe1aplWMvHrn3RZN74PMhdQCShdOrI5NjKFyfXUUat1RKp0Jr7u/q Gu/ycJX+2kscIO9iQ99ChAIyaTaiuFWiTPnKqLre7J39I2rUSaA== X-Received: by 2002:a17:906:da82:b0:979:7624:1f71 with SMTP id xh2-20020a170906da8200b0097976241f71mr941172ejb.26.1686303178487; Fri, 09 Jun 2023 02:32:58 -0700 (PDT) X-Received: by 2002:a17:906:da82:b0:979:7624:1f71 with SMTP id xh2-20020a170906da8200b0097976241f71mr941163ejb.26.1686303178315; Fri, 09 Jun 2023 02:32:58 -0700 (PDT) Received: from amikhalitsyn.local (dslb-002-205-064-187.002.205.pools.vodafone-ip.de. [2.205.64.187]) by smtp.gmail.com with ESMTPSA id e25-20020a170906081900b0094ee3e4c934sm1031248ejd.221.2023.06.09.02.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 02:32:57 -0700 (PDT) From: Alexander Mikhalitsyn To: xiubli@redhat.com Cc: brauner@kernel.org, stgraber@ubuntu.com, linux-fsdevel@vger.kernel.org, Christian Brauner , Jeff Layton , Ilya Dryomov , ceph-devel@vger.kernel.org, Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v6 10/15] ceph/file: allow idmapped atomic_open inode op Date: Fri, 9 Jun 2023 11:31:21 +0200 Message-Id: <20230609093125.252186-11-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230609093125.252186-1-aleksandr.mikhalitsyn@canonical.com> References: <20230609093125.252186-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1768220870049166255?= X-GMAIL-MSGID: =?utf-8?q?1768220870049166255?= 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 e878a462c7c3..7be172f29c0b 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -655,7 +655,9 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode, in.truncate_seq = cpu_to_le32(1); in.truncate_size = cpu_to_le64(-1ULL); in.xattr_version = cpu_to_le64(1); - in.uid = cpu_to_le32(from_kuid(&init_user_ns, current_fsuid())); + in.uid = 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 = cpu_to_le32(from_kgid(&init_user_ns, dir->i_gid)); @@ -663,7 +665,9 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode, if (S_ISDIR(mode)) mode |= S_ISGID; } else { - in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid())); + in.gid = cpu_to_le32(from_kgid(&init_user_ns, + mapped_fsgid(req->r_mnt_idmap, + &init_user_ns))); } in.mode = cpu_to_le32((u32)mode); @@ -731,6 +735,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, struct file *file, unsigned flags, umode_t mode) { struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb); + struct mnt_idmap *idmap = file_mnt_idmap(file); struct ceph_mds_client *mdsc = fsc->mdsc; struct ceph_mds_request *req; struct inode *new_inode = NULL; @@ -788,6 +793,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, mask |= CEPH_CAP_XATTR_SHARED; req->r_args.open.mask = cpu_to_le32(mask); req->r_parent = dir; + req->r_mnt_idmap = mnt_idmap_get(idmap); ihold(dir); if (IS_ENCRYPTED(dir)) { set_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags);