Received: by 2002:a05:6358:700f:b0:131:369:b2a3 with SMTP id 15csp3033420rwo; Thu, 3 Aug 2023 20:44:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBRYki9kV8An7rKRsTtZjjHKneq+H5u5TMOHBOn9vP3q3TlgsNV1g6QE4EYQYcNUjoGhxe X-Received: by 2002:a17:906:fd88:b0:994:fec:e1b7 with SMTP id xa8-20020a170906fd8800b009940fece1b7mr708400ejb.0.1691120665945; Thu, 03 Aug 2023 20:44:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691120665; cv=none; d=google.com; s=arc-20160816; b=ph/SEiILaMydwmaFZ29SUfvgDscU+NZZ4UVM3irNT74gFT5pkPfLCB2UM1d+isteqe YBqDzRclyjd69a8GQtH7/5G6urOUqJWUM77wXa/SlyBV43IRKlnZeDQZRp0Gh5UJFF43 Sjc8LfAeMiecyL/sVKZ0c4z1NUWXByjVMBD5XfKYGYf3N81ySSqASGkoJlGWTe4TEvzj vT0IxtYohgAk5x92TKchdLq8lrfqYQAV9B3DySalMSbkKq7nnyG/tSE13TD2I6C6MhnG 5zdesrWnXmuzVPstWI6NHw8Dl/0yEvGAt/33KgcAwlJFqdgTPiaaoaTI3A2DiY/quN1z VJOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=H0wMlfA22BxZl9Q9Znlq2V03kgETsb/XxqrfcgpjE8w=; fh=bKXXR7sO6B5OIRXiuivaA7wyK2CJKURiYf/AxaioSm4=; b=aPbgBAktGGT70t3XrI1B3BlviJUhv2X3WsofnlOreWeiZ6Sr0KxFMKMqwF7kCvti7q kINmDbDofOyaLKU7kXwUU3uD7mRPIWNI75Zg85DlTwgwwkkiK/vQzqMcu0/olTRfQEvE ODMnmn1C3eRj8PgebI9RC0FGQbzUBaQr7YSxP+/H6lsMkM5tjIPqqTgT9Fym0tNPTIh1 s/5vDq63HSv2fHcsrV/cZPQKHh4zWVkZSObofnA1Fa136EikprS4iPqpGSPn8a2LQmHm H2QbISkn1xEzxbTYjkqPjwpFklzibs7ytdU2hdVSCPOLsbfsT2MjJy8Jk6o3MOg3EZjn FLDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qwee6ohO; 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=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x2-20020a1709060a4200b0099bc55749c1si949098ejf.349.2023.08.03.20.44.00; Thu, 03 Aug 2023 20:44:25 -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=@redhat.com header.s=mimecast20190719 header.b=Qwee6ohO; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231952AbjHDC1O (ORCPT + 99 others); Thu, 3 Aug 2023 22:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbjHDC1L (ORCPT ); Thu, 3 Aug 2023 22:27:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7F003A9C for ; Thu, 3 Aug 2023 19:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691115984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H0wMlfA22BxZl9Q9Znlq2V03kgETsb/XxqrfcgpjE8w=; b=Qwee6ohOPu5OWcycc4tq1hER94mgMDOfSGoSeXWK4O7hh0udiapIaunY/ZGZ5q6TZ6kjxC SZIGoBkKMHVeoW5JzrsJH3L7MXJWNvw7egeYqu7EVercu0TTqqaleuXcaFFbeKDGT0y5tq ghlpdIi2UTcVDJEWtnISrzVSwaspIq8= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-K4BYLxB4N4-KwpatgN2yjg-1; Thu, 03 Aug 2023 22:26:23 -0400 X-MC-Unique: K4BYLxB4N4-KwpatgN2yjg-1 Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-2684179be07so909392a91.2 for ; Thu, 03 Aug 2023 19:26:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691115982; x=1691720782; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=H0wMlfA22BxZl9Q9Znlq2V03kgETsb/XxqrfcgpjE8w=; b=Lg/c8XFMKbBKZ193fAExtRQIYLttls6KgsUEk5TLRQcxbPGlRTvd/Q7VBe34bx6zA+ ytd4KrtDcBNv2MsNLhQMi4k3BtbbOpNBkvE5t7UmlFU93IhLWyK7rDIyU28aF9vOkKau h4+KVzQVqGcOZ7uajiAZAhdGO0kmNjibVE+berS/H9DpZvQKf1bk1RTEW/CH7fsoGGLa AswdC1Z6sievG1TjGa9OoVKhonn0lYPhpFmKW7y0Lf8822q8VYL55DJ6v4PSZcXRcgnf herP9OIkMCUBQMf7jWsKpOVCUJyZl1IblS2x9GTSjJZGuZO5WD8YIYWJq8VoqfpJITZ7 RHTw== X-Gm-Message-State: AOJu0YxM+cc4TfA9nzT/atOXxVOygTy+54Q/poTDcE272tBKr5lPm9Ii GNPa6retR96xhOjlJCNNfOtUVm01QzN1KTM3wianG9M7K08kkg3ckgDXMcOIA1wHqcIYnWhHdpK SayYB9uT/kHEUfoUqZ68peG4X X-Received: by 2002:a17:90a:2e13:b0:263:f9c8:9d9e with SMTP id q19-20020a17090a2e1300b00263f9c89d9emr413736pjd.46.1691115982682; Thu, 03 Aug 2023 19:26:22 -0700 (PDT) X-Received: by 2002:a17:90a:2e13:b0:263:f9c8:9d9e with SMTP id q19-20020a17090a2e1300b00263f9c89d9emr413724pjd.46.1691115982357; Thu, 03 Aug 2023 19:26:22 -0700 (PDT) Received: from [10.72.112.41] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d4-20020a17090a8d8400b00263fc1ef1aasm3129493pjo.10.2023.08.03.19.26.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Aug 2023 19:26:21 -0700 (PDT) Message-ID: <71018b94-45a0-3404-d3d0-d9f808a72a00@redhat.com> Date: Fri, 4 Aug 2023 10:26:16 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v8 03/12] ceph: handle idmapped mounts in create_request_message() To: Alexander Mikhalitsyn Cc: brauner@kernel.org, stgraber@ubuntu.com, linux-fsdevel@vger.kernel.org, Jeff Layton , Ilya Dryomov , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230803135955.230449-1-aleksandr.mikhalitsyn@canonical.com> <20230803135955.230449-4-aleksandr.mikhalitsyn@canonical.com> Content-Language: en-US From: Xiubo Li In-Reply-To: <20230803135955.230449-4-aleksandr.mikhalitsyn@canonical.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 On 8/3/23 21:59, Alexander Mikhalitsyn wrote: > From: Christian Brauner > > Inode operations that create a new filesystem object such as ->mknod, > ->create, ->mkdir() and others don't take a {g,u}id argument explicitly. > Instead the caller's fs{g,u}id is used for the {g,u}id of the new > filesystem object. > > In order to ensure that the correct {g,u}id is used map the caller's > fs{g,u}id for creation requests. This doesn't require complex changes. > It suffices to pass in the relevant idmapping recorded in the request > message. If this request message was triggered from an inode operation > that creates filesystem objects it will have passed down the relevant > idmaping. If this is a request message that was triggered from an inode > operation that doens't need to take idmappings into account the initial > idmapping is passed down which is an identity mapping. > > This change uses a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID > which adds two new fields (owner_{u,g}id) to the request head structure. > So, we need to ensure that MDS supports it otherwise we need to fail > any IO that comes through an idmapped mount because we can't process it > in a proper way. MDS server without such an extension will use caller_{u,g}id > fields to set a new inode owner UID/GID which is incorrect because caller_{u,g}id > values are unmapped. At the same time we can't map these fields with an > idmapping as it can break UID/GID-based permission checks logic on the > MDS side. This problem was described with a lot of details at [1], [2]. > > [1] https://lore.kernel.org/lkml/CAEivzxfw1fHO2TFA4dx3u23ZKK6Q+EThfzuibrhA3RKM=ZOYLg@mail.gmail.com/ > [2] https://lore.kernel.org/all/20220104140414.155198-3-brauner@kernel.org/ > > https://github.com/ceph/ceph/pull/52575 > https://tracker.ceph.com/issues/62217 > > Cc: Xiubo Li > Cc: Jeff Layton > Cc: Ilya Dryomov > Cc: ceph-devel@vger.kernel.org > Co-Developed-by: Alexander Mikhalitsyn > Signed-off-by: Christian Brauner > Signed-off-by: Alexander Mikhalitsyn > --- > v7: > - reworked to use two new fields for owner UID/GID (https://github.com/ceph/ceph/pull/52575) > v8: > - properly handled case when old MDS used with new kernel client > --- > fs/ceph/mds_client.c | 46 +++++++++++++++++++++++++++++++++--- > fs/ceph/mds_client.h | 5 +++- > include/linux/ceph/ceph_fs.h | 4 +++- > 3 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c > index 8829f55103da..7d3106d3b726 100644 > --- a/fs/ceph/mds_client.c > +++ b/fs/ceph/mds_client.c > @@ -2902,6 +2902,17 @@ static void encode_mclientrequest_tail(void **p, const struct ceph_mds_request * > } > } > > +static inline u16 mds_supported_head_version(struct ceph_mds_session *session) > +{ > + if (!test_bit(CEPHFS_FEATURE_32BITS_RETRY_FWD, &session->s_features)) > + return 1; > + > + if (!test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features)) > + return 2; > + > + return CEPH_MDS_REQUEST_HEAD_VERSION; > +} > + > static struct ceph_mds_request_head_legacy * > find_legacy_request_head(void *p, u64 features) > { > @@ -2923,6 +2934,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, > { > int mds = session->s_mds; > struct ceph_mds_client *mdsc = session->s_mdsc; > + struct ceph_client *cl = mdsc->fsc->client; > struct ceph_msg *msg; > struct ceph_mds_request_head_legacy *lhead; > const char *path1 = NULL; > @@ -2936,7 +2948,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, > void *p, *end; > int ret; > bool legacy = !(session->s_con.peer_features & CEPH_FEATURE_FS_BTIME); > - bool old_version = !test_bit(CEPHFS_FEATURE_32BITS_RETRY_FWD, &session->s_features); > + u16 request_head_version = mds_supported_head_version(session); > > ret = set_request_path_attr(mdsc, req->r_inode, req->r_dentry, > req->r_parent, req->r_path1, req->r_ino1.ino, > @@ -2977,8 +2989,10 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, > */ > if (legacy) > len = sizeof(struct ceph_mds_request_head_legacy); > - else if (old_version) > + else if (request_head_version == 1) > len = sizeof(struct ceph_mds_request_head_old); > + else if (request_head_version == 2) > + len = offsetofend(struct ceph_mds_request_head, ext_num_fwd); > else > len = sizeof(struct ceph_mds_request_head); > This is not what we suppose to. If we do this again and again when adding new members it will make the code very complicated to maintain. Once the CEPHFS_FEATURE_32BITS_RETRY_FWD has been supported the ceph should correctly decode it and if CEPHFS_FEATURE_HAS_OWNER_UIDGID is not supported the decoder should skip it directly. Is the MDS side buggy ? Why you last version didn't work ? Thanks - Xiubo > @@ -3028,6 +3042,16 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, > lhead = find_legacy_request_head(msg->front.iov_base, > session->s_con.peer_features); > > + if ((req->r_mnt_idmap != &nop_mnt_idmap) && > + !test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features)) { > + pr_err_ratelimited_client(cl, > + "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID" > + " is not supported by MDS. Fail request with -EIO.\n"); > + > + ret = -EIO; > + goto out_err; > + } > + > /* > * The ceph_mds_request_head_legacy didn't contain a version field, and > * one was added when we moved the message version from 3->4. > @@ -3035,17 +3059,33 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, > if (legacy) { > msg->hdr.version = cpu_to_le16(3); > p = msg->front.iov_base + sizeof(*lhead); > - } else if (old_version) { > + } else if (request_head_version == 1) { > struct ceph_mds_request_head_old *ohead = msg->front.iov_base; > > msg->hdr.version = cpu_to_le16(4); > ohead->version = cpu_to_le16(1); > p = msg->front.iov_base + sizeof(*ohead); > + } else if (request_head_version == 2) { > + struct ceph_mds_request_head *nhead = msg->front.iov_base; > + > + msg->hdr.version = cpu_to_le16(6); > + nhead->version = cpu_to_le16(2); > + > + p = msg->front.iov_base + offsetofend(struct ceph_mds_request_head, ext_num_fwd); > } else { > struct ceph_mds_request_head *nhead = msg->front.iov_base; > + kuid_t owner_fsuid; > + kgid_t owner_fsgid; > > msg->hdr.version = cpu_to_le16(6); > nhead->version = cpu_to_le16(CEPH_MDS_REQUEST_HEAD_VERSION); > + > + owner_fsuid = from_vfsuid(req->r_mnt_idmap, &init_user_ns, > + VFSUIDT_INIT(req->r_cred->fsuid)); > + owner_fsgid = from_vfsgid(req->r_mnt_idmap, &init_user_ns, > + VFSGIDT_INIT(req->r_cred->fsgid)); > + nhead->owner_uid = cpu_to_le32(from_kuid(&init_user_ns, owner_fsuid)); > + nhead->owner_gid = cpu_to_le32(from_kgid(&init_user_ns, owner_fsgid)); > p = msg->front.iov_base + sizeof(*nhead); > } > > diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h > index e3bbf3ba8ee8..8f683e8203bd 100644 > --- a/fs/ceph/mds_client.h > +++ b/fs/ceph/mds_client.h > @@ -33,8 +33,10 @@ enum ceph_feature_type { > CEPHFS_FEATURE_NOTIFY_SESSION_STATE, > CEPHFS_FEATURE_OP_GETVXATTR, > CEPHFS_FEATURE_32BITS_RETRY_FWD, > + CEPHFS_FEATURE_NEW_SNAPREALM_INFO, > + CEPHFS_FEATURE_HAS_OWNER_UIDGID, > > - CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_32BITS_RETRY_FWD, > + CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_HAS_OWNER_UIDGID, > }; > > #define CEPHFS_FEATURES_CLIENT_SUPPORTED { \ > @@ -49,6 +51,7 @@ enum ceph_feature_type { > CEPHFS_FEATURE_NOTIFY_SESSION_STATE, \ > CEPHFS_FEATURE_OP_GETVXATTR, \ > CEPHFS_FEATURE_32BITS_RETRY_FWD, \ > + CEPHFS_FEATURE_HAS_OWNER_UIDGID, \ > } > > /* > diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h > index 5f2301ee88bc..6eb83a51341c 100644 > --- a/include/linux/ceph/ceph_fs.h > +++ b/include/linux/ceph/ceph_fs.h > @@ -499,7 +499,7 @@ struct ceph_mds_request_head_legacy { > union ceph_mds_request_args args; > } __attribute__ ((packed)); > > -#define CEPH_MDS_REQUEST_HEAD_VERSION 2 > +#define CEPH_MDS_REQUEST_HEAD_VERSION 3 > > struct ceph_mds_request_head_old { > __le16 version; /* struct version */ > @@ -530,6 +530,8 @@ struct ceph_mds_request_head { > > __le32 ext_num_retry; /* new count retry attempts */ > __le32 ext_num_fwd; /* new count fwd attempts */ > + > + __le32 owner_uid, owner_gid; /* used for OPs which create inodes */ > } __attribute__ ((packed)); > > /* cap/lease release record */