From patchwork Thu Aug 3 13:59:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 130714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1252403vqx; Thu, 3 Aug 2023 09:10:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlHMXm98jsoi+y2UhK6WKcFZiWQurD5h1Cg3CWz3nsCI/1F2NMOy6g8QpPpxQ6rEDzRzXKg8 X-Received: by 2002:a2e:9d98:0:b0:2b9:ef0a:7d4a with SMTP id c24-20020a2e9d98000000b002b9ef0a7d4amr7955326ljj.36.1691079011243; Thu, 03 Aug 2023 09:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691079011; cv=none; d=google.com; s=arc-20160816; b=KzBPtHwJKICEJLfqYI4VXLfPz+ocgsRBHgT1KaBGxiYgiGaftTqav5AnDSkE/b19a/ Zvnd/gE62or9kxOcZ4K9OlnlCx0a8ZPomIcI5t9Gp2WMT5ykWGugyg8H8BpwLO5F8qD7 AWOvex6kayVVvC1pE6hl/a5ttHdH5qJoeWMg2TQa0NG5hBUxvJgAyDMcZXpcAI+xU7L8 JK6+gqZaDWB+114l217DIa7O0gnOixJ6c1yDwm7MYUQNy43RXu6gJIrrrFwB/53pKvVj 6YeT9UAjlHRMz8qXLDXdKFUxcJozdVmSAOtbRTuQaHQKBduC5FOAcfREQLYQdZHU/poN 2oLQ== 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=3z9qgb9ifPvjMsignbqopXQPiRZw936kb1zQwGNpHt4=; fh=Z2mkFIQPI1atT1PXylFFs5aXkUtGzwkgwqJaEftWDsI=; b=Mwt2GJsXGl9HHnrVsjcFHuhV8k8Zjgw0AmJ4fdA89yZqCaH/AaRXRlqahhtUXRjsYw 2qx1OyXwwStDRqz7ietSLbxgIY7aCkSNQdtqKGhK1rMeQh9Psdkim8ITp1KtfXtuKFAH VyzyB5xvW76Jt8yJOi6i7WSvghIFe2NpQWc1d4Jr4xEg0JfAx92uUPojQe5ttXalJZ94 eV2kPzPX+OdTPyWK4k0b6QYbWaCw87lFaac90XWWKJ+FngKg4dnX0Z/fkHyCJJdAXvoX mO8USrqtfjP1bxi3C80oNsgGWBLV59cKK9HSYRm9SEgEyvzuG3fPYKuaa3FZ04YmcE/f oz+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=KpxGdts9; 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 q25-20020a1709064cd900b00992d0de875esi20027ejt.914.2023.08.03.09.09.42; Thu, 03 Aug 2023 09:10:11 -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=KpxGdts9; 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 S234446AbjHCOCK (ORCPT + 99 others); Thu, 3 Aug 2023 10:02:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236578AbjHCOBX (ORCPT ); Thu, 3 Aug 2023 10:01:23 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D3DC3A9F for ; Thu, 3 Aug 2023 07:00:47 -0700 (PDT) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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-1.canonical.com (Postfix) with ESMTPS id EC7C1413D5 for ; Thu, 3 Aug 2023 14:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1691071238; bh=3z9qgb9ifPvjMsignbqopXQPiRZw936kb1zQwGNpHt4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KpxGdts9ohXv2liGir1FzV+8kXas8YpOpHIKcrcTvISOoqQt5lQJajchAfNsiHCNt 1OVhNIQ1LL0Z7F2vyQdAPdE8l3IhgTyoblROFT4B9sa6c+SjTdaP2ljFK+pCtrPWji QOTf2ETUpz0VMHVH2tg9QD9p/RafZqUab6XalD5UqaJMjJcfk7tCJ52kNqZlt9DUfS TTMFJKLeWknzudLmijWDacvyQLbgdJ9kpH+ZW95vZ54utovhzdipCkzE1M4277rs7S q/gi1KkoPDKcbhVF9A2VJ6rytwUZWxP3OmvIWUmiovu1hlCJPD8W7CcWPt6Y540Ln8 ZcUcEoh2cAlFw== Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-521a38098faso678596a12.2 for ; Thu, 03 Aug 2023 07:00:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691071238; x=1691676038; 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=3z9qgb9ifPvjMsignbqopXQPiRZw936kb1zQwGNpHt4=; b=Laj3Nu1WOExFvJYZKsh2gh56p996m0hAGaeTTn41DrWsBlAug1VLe9SqFOmXLxmMQd N3FXgTmknY1vnAuJ5+Z11bWuY98lQyNqDuizpWAuog96ajTcTxti0NAKhytm5eb6bB/7 f3iVDEXDraf3Yxs/SeJfxapWxhoB8G64HozVTI+PhFNRQ0aMKu1Jj7UjjNZ7bhtpWYTE ipZx39uWZtd82FWuIAowPPrtWvpHgMl7Rray3O1FbH2F0VqocZgsKIsyemtIrtv1Boe7 UWe+91EJB+yapECynK/gvGTtU/nNStMo2WWFklrJPy7p5u/SKEqh37PSyMogn+wMAvWT efEQ== X-Gm-Message-State: ABy/qLaEFK5ZxrMIYRipc19oW3h4btZv1koAXIZnhoz7kKrIymxQh10i l3Q4deY5edykNBCON0W9KIKMfdA5htfyG/D1qYOJWekVc5VNJxkagwCP1St2+l+JZ8Axho+7WAi i5I9LqS1ROAbk7DRmgDDOsTRhcp7JQbpGM8CKfer6Og== X-Received: by 2002:aa7:d7c9:0:b0:522:2b76:1985 with SMTP id e9-20020aa7d7c9000000b005222b761985mr7132495eds.2.1691071238722; Thu, 03 Aug 2023 07:00:38 -0700 (PDT) X-Received: by 2002:aa7:d7c9:0:b0:522:2b76:1985 with SMTP id e9-20020aa7d7c9000000b005222b761985mr7132484eds.2.1691071238558; Thu, 03 Aug 2023 07:00:38 -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 bc21-20020a056402205500b0052229882fb0sm10114822edb.71.2023.08.03.07.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 07:00:38 -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, Alexander Mikhalitsyn , linux-kernel@vger.kernel.org Subject: [PATCH v8 11/12] ceph/file: allow idmapped atomic_open inode op Date: Thu, 3 Aug 2023 15:59:54 +0200 Message-Id: <20230803135955.230449-12-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803135955.230449-1-aleksandr.mikhalitsyn@canonical.com> References: <20230803135955.230449-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1773224865025300132 X-GMAIL-MSGID: 1773224865025300132 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 = 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)); @@ -676,7 +678,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); @@ -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 = file_mnt_idmap(file); struct ceph_fs_client *fsc = ceph_sb_to_fs_client(dir->i_sb); struct ceph_client *cl = fsc->client; struct ceph_mds_client *mdsc = fsc->mdsc; @@ -802,6 +807,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);