2010-05-29 00:45:14 +04:00
|
|
|
/*
|
|
|
|
* CDDL HEADER START
|
|
|
|
*
|
|
|
|
* The contents of this file are subject to the terms of the
|
|
|
|
* Common Development and Distribution License (the "License").
|
|
|
|
* You may not use this file except in compliance with the License.
|
|
|
|
*
|
|
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
|
|
* See the License for the specific language governing permissions
|
|
|
|
* and limitations under the License.
|
|
|
|
*
|
|
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
|
|
*
|
|
|
|
* CDDL HEADER END
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
*/
|
|
|
|
|
2015-04-02 06:44:32 +03:00
|
|
|
#include <sys/zfs_context.h>
|
2010-05-29 00:45:14 +04:00
|
|
|
#include <sys/vnode.h>
|
|
|
|
#include <sys/sa.h>
|
|
|
|
#include <sys/zfs_acl.h>
|
|
|
|
#include <sys/zfs_sa.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ZPL attribute registration table.
|
|
|
|
* Order of attributes doesn't matter
|
|
|
|
* a unique value will be assigned for each
|
|
|
|
* attribute that is file system specific
|
|
|
|
*
|
|
|
|
* This is just the set of ZPL attributes that this
|
|
|
|
* version of ZFS deals with natively. The file system
|
|
|
|
* could have other attributes stored in files, but they will be
|
|
|
|
* ignored. The SA framework will preserve them, just that
|
|
|
|
* this version of ZFS won't change or delete them.
|
|
|
|
*/
|
|
|
|
|
|
|
|
sa_attr_reg_t zfs_attr_table[ZPL_END+1] = {
|
|
|
|
{"ZPL_ATIME", sizeof (uint64_t) * 2, SA_UINT64_ARRAY, 0},
|
|
|
|
{"ZPL_MTIME", sizeof (uint64_t) * 2, SA_UINT64_ARRAY, 1},
|
|
|
|
{"ZPL_CTIME", sizeof (uint64_t) * 2, SA_UINT64_ARRAY, 2},
|
|
|
|
{"ZPL_CRTIME", sizeof (uint64_t) * 2, SA_UINT64_ARRAY, 3},
|
|
|
|
{"ZPL_GEN", sizeof (uint64_t), SA_UINT64_ARRAY, 4},
|
|
|
|
{"ZPL_MODE", sizeof (uint64_t), SA_UINT64_ARRAY, 5},
|
|
|
|
{"ZPL_SIZE", sizeof (uint64_t), SA_UINT64_ARRAY, 6},
|
|
|
|
{"ZPL_PARENT", sizeof (uint64_t), SA_UINT64_ARRAY, 7},
|
|
|
|
{"ZPL_LINKS", sizeof (uint64_t), SA_UINT64_ARRAY, 8},
|
|
|
|
{"ZPL_XATTR", sizeof (uint64_t), SA_UINT64_ARRAY, 9},
|
|
|
|
{"ZPL_RDEV", sizeof (uint64_t), SA_UINT64_ARRAY, 10},
|
|
|
|
{"ZPL_FLAGS", sizeof (uint64_t), SA_UINT64_ARRAY, 11},
|
|
|
|
{"ZPL_UID", sizeof (uint64_t), SA_UINT64_ARRAY, 12},
|
|
|
|
{"ZPL_GID", sizeof (uint64_t), SA_UINT64_ARRAY, 13},
|
|
|
|
{"ZPL_PAD", sizeof (uint64_t) * 4, SA_UINT64_ARRAY, 14},
|
|
|
|
{"ZPL_ZNODE_ACL", 88, SA_UINT8_ARRAY, 15},
|
|
|
|
{"ZPL_DACL_COUNT", sizeof (uint64_t), SA_UINT64_ARRAY, 0},
|
|
|
|
{"ZPL_SYMLINK", 0, SA_UINT8_ARRAY, 0},
|
|
|
|
{"ZPL_SCANSTAMP", 32, SA_UINT8_ARRAY, 0},
|
|
|
|
{"ZPL_DACL_ACES", 0, SA_ACL, 0},
|
2011-10-25 03:55:20 +04:00
|
|
|
{"ZPL_DXATTR", 0, SA_UINT8_ARRAY, 0},
|
2010-05-29 00:45:14 +04:00
|
|
|
{NULL, 0, 0, 0}
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef _KERNEL
|
|
|
|
int
|
|
|
|
zfs_sa_readlink(znode_t *zp, uio_t *uio)
|
|
|
|
{
|
|
|
|
dmu_buf_t *db = sa_get_db(zp->z_sa_hdl);
|
|
|
|
size_t bufsz;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
bufsz = zp->z_size;
|
|
|
|
if (bufsz + ZFS_OLD_ZNODE_PHYS_SIZE <= db->db_size) {
|
|
|
|
error = uiomove((caddr_t)db->db_data +
|
|
|
|
ZFS_OLD_ZNODE_PHYS_SIZE,
|
|
|
|
MIN((size_t)bufsz, uio->uio_resid), UIO_READ, uio);
|
|
|
|
} else {
|
|
|
|
dmu_buf_t *dbp;
|
2011-02-08 22:16:06 +03:00
|
|
|
if ((error = dmu_buf_hold(ZTOZSB(zp)->z_os, zp->z_id,
|
2010-05-29 00:45:14 +04:00
|
|
|
0, FTAG, &dbp, DMU_READ_NO_PREFETCH)) == 0) {
|
|
|
|
error = uiomove(dbp->db_data,
|
|
|
|
MIN((size_t)bufsz, uio->uio_resid), UIO_READ, uio);
|
|
|
|
dmu_buf_rele(dbp, FTAG);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zfs_sa_symlink(znode_t *zp, char *link, int len, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
dmu_buf_t *db = sa_get_db(zp->z_sa_hdl);
|
|
|
|
|
|
|
|
if (ZFS_OLD_ZNODE_PHYS_SIZE + len <= dmu_bonus_max()) {
|
|
|
|
VERIFY(dmu_set_bonus(db,
|
|
|
|
len + ZFS_OLD_ZNODE_PHYS_SIZE, tx) == 0);
|
|
|
|
if (len) {
|
|
|
|
bcopy(link, (caddr_t)db->db_data +
|
|
|
|
ZFS_OLD_ZNODE_PHYS_SIZE, len);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
dmu_buf_t *dbp;
|
|
|
|
|
|
|
|
zfs_grow_blocksize(zp, len, tx);
|
2011-02-08 22:16:06 +03:00
|
|
|
VERIFY(0 == dmu_buf_hold(ZTOZSB(zp)->z_os,
|
2010-05-29 00:45:14 +04:00
|
|
|
zp->z_id, 0, FTAG, &dbp, DMU_READ_NO_PREFETCH));
|
|
|
|
|
|
|
|
dmu_buf_will_dirty(dbp, tx);
|
|
|
|
|
|
|
|
ASSERT3U(len, <=, dbp->db_size);
|
|
|
|
bcopy(link, dbp->db_data, len);
|
|
|
|
dmu_buf_rele(dbp, FTAG);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zfs_sa_get_scanstamp(znode_t *zp, xvattr_t *xvap)
|
|
|
|
{
|
2011-02-08 22:16:06 +03:00
|
|
|
zfs_sb_t *zsb = ZTOZSB(zp);
|
2010-05-29 00:45:14 +04:00
|
|
|
xoptattr_t *xoap;
|
|
|
|
|
2010-08-27 01:24:34 +04:00
|
|
|
ASSERT(MUTEX_HELD(&zp->z_lock));
|
2010-05-29 00:45:14 +04:00
|
|
|
VERIFY((xoap = xva_getxoptattr(xvap)) != NULL);
|
|
|
|
if (zp->z_is_sa) {
|
2011-02-08 22:16:06 +03:00
|
|
|
if (sa_lookup(zp->z_sa_hdl, SA_ZPL_SCANSTAMP(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
&xoap->xoa_av_scanstamp,
|
|
|
|
sizeof (xoap->xoa_av_scanstamp)) != 0)
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
dmu_object_info_t doi;
|
|
|
|
dmu_buf_t *db = sa_get_db(zp->z_sa_hdl);
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (!(zp->z_pflags & ZFS_BONUS_SCANSTAMP))
|
|
|
|
return;
|
|
|
|
|
|
|
|
sa_object_info(zp->z_sa_hdl, &doi);
|
|
|
|
len = sizeof (xoap->xoa_av_scanstamp) +
|
|
|
|
ZFS_OLD_ZNODE_PHYS_SIZE;
|
|
|
|
|
|
|
|
if (len <= doi.doi_bonus_size) {
|
|
|
|
(void) memcpy(xoap->xoa_av_scanstamp,
|
|
|
|
(caddr_t)db->db_data + ZFS_OLD_ZNODE_PHYS_SIZE,
|
|
|
|
sizeof (xoap->xoa_av_scanstamp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XVA_SET_RTN(xvap, XAT_AV_SCANSTAMP);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zfs_sa_set_scanstamp(znode_t *zp, xvattr_t *xvap, dmu_tx_t *tx)
|
|
|
|
{
|
2011-02-08 22:16:06 +03:00
|
|
|
zfs_sb_t *zsb = ZTOZSB(zp);
|
2010-05-29 00:45:14 +04:00
|
|
|
xoptattr_t *xoap;
|
|
|
|
|
2010-08-27 01:24:34 +04:00
|
|
|
ASSERT(MUTEX_HELD(&zp->z_lock));
|
2010-05-29 00:45:14 +04:00
|
|
|
VERIFY((xoap = xva_getxoptattr(xvap)) != NULL);
|
|
|
|
if (zp->z_is_sa)
|
2011-02-08 22:16:06 +03:00
|
|
|
VERIFY(0 == sa_update(zp->z_sa_hdl, SA_ZPL_SCANSTAMP(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
&xoap->xoa_av_scanstamp,
|
|
|
|
sizeof (xoap->xoa_av_scanstamp), tx));
|
|
|
|
else {
|
|
|
|
dmu_object_info_t doi;
|
|
|
|
dmu_buf_t *db = sa_get_db(zp->z_sa_hdl);
|
|
|
|
int len;
|
|
|
|
|
|
|
|
sa_object_info(zp->z_sa_hdl, &doi);
|
|
|
|
len = sizeof (xoap->xoa_av_scanstamp) +
|
|
|
|
ZFS_OLD_ZNODE_PHYS_SIZE;
|
|
|
|
if (len > doi.doi_bonus_size)
|
|
|
|
VERIFY(dmu_set_bonus(db, len, tx) == 0);
|
|
|
|
(void) memcpy((caddr_t)db->db_data + ZFS_OLD_ZNODE_PHYS_SIZE,
|
|
|
|
xoap->xoa_av_scanstamp, sizeof (xoap->xoa_av_scanstamp));
|
|
|
|
|
|
|
|
zp->z_pflags |= ZFS_BONUS_SCANSTAMP;
|
2011-02-08 22:16:06 +03:00
|
|
|
VERIFY(0 == sa_update(zp->z_sa_hdl, SA_ZPL_FLAGS(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
&zp->z_pflags, sizeof (uint64_t), tx));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-25 03:55:20 +04:00
|
|
|
int
|
|
|
|
zfs_sa_get_xattr(znode_t *zp)
|
|
|
|
{
|
|
|
|
zfs_sb_t *zsb = ZTOZSB(zp);
|
|
|
|
char *obj;
|
|
|
|
int size;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
ASSERT(RW_LOCK_HELD(&zp->z_xattr_lock));
|
|
|
|
ASSERT(!zp->z_xattr_cached);
|
|
|
|
ASSERT(zp->z_is_sa);
|
|
|
|
|
2012-08-24 07:46:38 +04:00
|
|
|
error = sa_size(zp->z_sa_hdl, SA_ZPL_DXATTR(zsb), &size);
|
2011-10-25 03:55:20 +04:00
|
|
|
if (error) {
|
|
|
|
if (error == ENOENT)
|
|
|
|
return nvlist_alloc(&zp->z_xattr_cached,
|
|
|
|
NV_UNIQUE_NAME, KM_SLEEP);
|
|
|
|
else
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2014-12-16 22:44:24 +03:00
|
|
|
obj = zio_buf_alloc(size);
|
2011-10-25 03:55:20 +04:00
|
|
|
|
2012-08-24 07:46:38 +04:00
|
|
|
error = sa_lookup(zp->z_sa_hdl, SA_ZPL_DXATTR(zsb), obj, size);
|
2011-10-25 03:55:20 +04:00
|
|
|
if (error == 0)
|
|
|
|
error = nvlist_unpack(obj, size, &zp->z_xattr_cached, KM_SLEEP);
|
|
|
|
|
2014-12-16 22:44:24 +03:00
|
|
|
zio_buf_free(obj, size);
|
2011-10-25 03:55:20 +04:00
|
|
|
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
zfs_sa_set_xattr(znode_t *zp)
|
|
|
|
{
|
|
|
|
zfs_sb_t *zsb = ZTOZSB(zp);
|
|
|
|
dmu_tx_t *tx;
|
|
|
|
char *obj;
|
|
|
|
size_t size;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
ASSERT(RW_WRITE_HELD(&zp->z_xattr_lock));
|
|
|
|
ASSERT(zp->z_xattr_cached);
|
|
|
|
ASSERT(zp->z_is_sa);
|
|
|
|
|
|
|
|
error = nvlist_size(zp->z_xattr_cached, &size, NV_ENCODE_XDR);
|
2015-12-30 05:41:22 +03:00
|
|
|
if ((error == 0) && (size > SA_ATTR_MAX_LEN))
|
|
|
|
error = EFBIG;
|
2011-10-25 03:55:20 +04:00
|
|
|
if (error)
|
|
|
|
goto out;
|
|
|
|
|
2014-12-16 22:44:24 +03:00
|
|
|
obj = zio_buf_alloc(size);
|
2011-10-25 03:55:20 +04:00
|
|
|
|
|
|
|
error = nvlist_pack(zp->z_xattr_cached, &obj, &size,
|
|
|
|
NV_ENCODE_XDR, KM_SLEEP);
|
|
|
|
if (error)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
tx = dmu_tx_create(zsb->z_os);
|
|
|
|
dmu_tx_hold_sa_create(tx, size);
|
2012-08-24 07:46:38 +04:00
|
|
|
dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_TRUE);
|
2011-10-25 03:55:20 +04:00
|
|
|
|
|
|
|
error = dmu_tx_assign(tx, TXG_WAIT);
|
|
|
|
if (error) {
|
|
|
|
dmu_tx_abort(tx);
|
|
|
|
} else {
|
2015-12-30 05:41:22 +03:00
|
|
|
VERIFY0(sa_update(zp->z_sa_hdl, SA_ZPL_DXATTR(zsb),
|
|
|
|
obj, size, tx));
|
|
|
|
dmu_tx_commit(tx);
|
2011-10-25 03:55:20 +04:00
|
|
|
}
|
|
|
|
out_free:
|
2014-12-16 22:44:24 +03:00
|
|
|
zio_buf_free(obj, size);
|
2011-10-25 03:55:20 +04:00
|
|
|
out:
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
/*
|
|
|
|
* I'm not convinced we should do any of this upgrade.
|
|
|
|
* since the SA code can read both old/new znode formats
|
2013-06-11 21:12:34 +04:00
|
|
|
* with probably little to no performance difference.
|
2010-05-29 00:45:14 +04:00
|
|
|
*
|
|
|
|
* All new files will be created with the new format.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
zfs_sa_upgrade(sa_handle_t *hdl, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
dmu_buf_t *db = sa_get_db(hdl);
|
|
|
|
znode_t *zp = sa_get_userdata(hdl);
|
2011-02-08 22:16:06 +03:00
|
|
|
zfs_sb_t *zsb = ZTOZSB(zp);
|
2010-05-29 00:45:14 +04:00
|
|
|
int count = 0;
|
2010-12-18 01:21:46 +03:00
|
|
|
sa_bulk_attr_t *bulk, *sa_attrs;
|
2010-05-29 00:45:14 +04:00
|
|
|
zfs_acl_locator_cb_t locate = { 0 };
|
|
|
|
uint64_t uid, gid, mode, rdev, xattr, parent;
|
Fix atime handling and relatime
The problem for atime:
We have 3 places for atime: inode->i_atime, znode->z_atime and SA. And its
handling is a mess. A huge part of mess regarding atime comes from
zfs_tstamp_update_setup, zfs_inode_update, and zfs_getattr, which behave
inconsistently with those three values.
zfs_tstamp_update_setup clears z_atime_dirty unconditionally as long as you
don't pass ATTR_ATIME. Which means every write(2) operation which only updates
ctime and mtime will cause atime changes to not be written to disk.
Also zfs_inode_update from write(2) will replace inode->i_atime with what's
inside SA(stale). But doesn't touch z_atime. So after read(2) and write(2).
You'll have i_atime(stale), z_atime(new), SA(stale) and z_atime_dirty=0.
Now, if you do stat(2), zfs_getattr will actually replace i_atime with what's
inside, z_atime. So you will have now you'll have i_atime(new), z_atime(new),
SA(stale) and z_atime_dirty=0. These will all gone after umount. And you'll
leave with a stale atime.
The problem for relatime:
We do have a relatime config inside ZFS dataset, but how it should interact
with the mount flag MS_RELATIME is not well defined. It seems it wanted
relatime mount option to override the dataset config by showing it as
temporary in `zfs get`. But at the same time, `zfs set relatime=on|off` would
also seems to want to override the mount option. Not to mention that
MS_RELATIME flag is actually never passed into ZFS, so it never really worked.
How Linux handles atime:
The Linux kernel actually handles atime completely in VFS, except for writing
it to disk. So if we remove the atime handling in ZFS, things would just work,
no matter it's strictatime, relatime, noatime, or even O_NOATIME. And whenever
VFS updates the i_atime, it will notify the underlying filesystem via
sb->dirty_inode().
And also there's one thing to note about atime flags like MS_RELATIME and
other flags like MS_NODEV, etc. They are mount point flags rather than
filesystem(sb) flags. Since native linux filesystem can be mounted at multiple
places at the same time, they can all have different atime settings. So these
flags are never passed down to filesystem drivers.
What this patch tries to do:
We remove znode->z_atime, since we won't gain anything from it. We remove most
of the atime handling and leave it to VFS. The only thing we do with atime is
to write it when dirty_inode() or setattr() is called. We also add
file_accessed() in zpl_read() since it's not provided in vfs_read().
After this patch, only the MS_RELATIME flag will have effect. The setting in
dataset won't do anything. We will make zfstuil to mount ZFS with MS_RELATIME
set according to the setting in dataset in future patch.
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4482
2016-03-30 03:53:34 +03:00
|
|
|
uint64_t crtime[2], mtime[2], ctime[2], atime[2];
|
2010-05-29 00:45:14 +04:00
|
|
|
zfs_acl_phys_t znode_acl;
|
|
|
|
char scanstamp[AV_SCANSTAMP_SZ];
|
2010-08-27 01:24:34 +04:00
|
|
|
boolean_t drop_lock = B_FALSE;
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* No upgrade if ACL isn't cached
|
|
|
|
* since we won't know which locks are held
|
|
|
|
* and ready the ACL would require special "locked"
|
|
|
|
* interfaces that would be messy
|
|
|
|
*/
|
2011-02-08 22:16:06 +03:00
|
|
|
if (zp->z_acl_cached == NULL || S_ISLNK(ZTOI(zp)->i_mode))
|
2010-05-29 00:45:14 +04:00
|
|
|
return;
|
|
|
|
|
2010-08-27 01:24:34 +04:00
|
|
|
/*
|
|
|
|
* If the z_lock is held and we aren't the owner
|
|
|
|
* the just return since we don't want to deadlock
|
|
|
|
* trying to update the status of z_is_sa. This
|
|
|
|
* file can then be upgraded at a later time.
|
|
|
|
*
|
|
|
|
* Otherwise, we know we are doing the
|
|
|
|
* sa_update() that caused us to enter this function.
|
|
|
|
*/
|
|
|
|
if (mutex_owner(&zp->z_lock) != curthread) {
|
|
|
|
if (mutex_tryenter(&zp->z_lock) == 0)
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
drop_lock = B_TRUE;
|
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
/* First do a bulk query of the attributes that aren't cached */
|
2013-11-01 23:26:11 +04:00
|
|
|
bulk = kmem_alloc(sizeof (sa_bulk_attr_t) * 20, KM_SLEEP);
|
Fix atime handling and relatime
The problem for atime:
We have 3 places for atime: inode->i_atime, znode->z_atime and SA. And its
handling is a mess. A huge part of mess regarding atime comes from
zfs_tstamp_update_setup, zfs_inode_update, and zfs_getattr, which behave
inconsistently with those three values.
zfs_tstamp_update_setup clears z_atime_dirty unconditionally as long as you
don't pass ATTR_ATIME. Which means every write(2) operation which only updates
ctime and mtime will cause atime changes to not be written to disk.
Also zfs_inode_update from write(2) will replace inode->i_atime with what's
inside SA(stale). But doesn't touch z_atime. So after read(2) and write(2).
You'll have i_atime(stale), z_atime(new), SA(stale) and z_atime_dirty=0.
Now, if you do stat(2), zfs_getattr will actually replace i_atime with what's
inside, z_atime. So you will have now you'll have i_atime(new), z_atime(new),
SA(stale) and z_atime_dirty=0. These will all gone after umount. And you'll
leave with a stale atime.
The problem for relatime:
We do have a relatime config inside ZFS dataset, but how it should interact
with the mount flag MS_RELATIME is not well defined. It seems it wanted
relatime mount option to override the dataset config by showing it as
temporary in `zfs get`. But at the same time, `zfs set relatime=on|off` would
also seems to want to override the mount option. Not to mention that
MS_RELATIME flag is actually never passed into ZFS, so it never really worked.
How Linux handles atime:
The Linux kernel actually handles atime completely in VFS, except for writing
it to disk. So if we remove the atime handling in ZFS, things would just work,
no matter it's strictatime, relatime, noatime, or even O_NOATIME. And whenever
VFS updates the i_atime, it will notify the underlying filesystem via
sb->dirty_inode().
And also there's one thing to note about atime flags like MS_RELATIME and
other flags like MS_NODEV, etc. They are mount point flags rather than
filesystem(sb) flags. Since native linux filesystem can be mounted at multiple
places at the same time, they can all have different atime settings. So these
flags are never passed down to filesystem drivers.
What this patch tries to do:
We remove znode->z_atime, since we won't gain anything from it. We remove most
of the atime handling and leave it to VFS. The only thing we do with atime is
to write it when dirty_inode() or setattr() is called. We also add
file_accessed() in zpl_read() since it's not provided in vfs_read().
After this patch, only the MS_RELATIME flag will have effect. The setting in
dataset won't do anything. We will make zfstuil to mount ZFS with MS_RELATIME
set according to the setting in dataset in future patch.
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4482
2016-03-30 03:53:34 +03:00
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ATIME(zsb), NULL, &atime, 16);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zsb), NULL, &mtime, 16);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zsb), NULL, &ctime, 16);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CRTIME(zsb), NULL, &crtime, 16);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zsb), NULL, &mode, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_PARENT(zsb), NULL, &parent, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_XATTR(zsb), NULL, &xattr, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_RDEV(zsb), NULL, &rdev, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_UID(zsb), NULL, &uid, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_GID(zsb), NULL, &gid, 8);
|
|
|
|
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ZNODE_ACL(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&znode_acl, 88);
|
|
|
|
|
2010-12-18 01:21:46 +03:00
|
|
|
if (sa_bulk_lookup_locked(hdl, bulk, count) != 0) {
|
2013-11-01 23:26:11 +04:00
|
|
|
kmem_free(bulk, sizeof (sa_bulk_attr_t) * 20);
|
2010-08-27 01:24:34 +04:00
|
|
|
goto done;
|
2010-12-18 01:21:46 +03:00
|
|
|
}
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* While the order here doesn't matter its best to try and organize
|
|
|
|
* it is such a way to pick up an already existing layout number
|
|
|
|
*/
|
|
|
|
count = 0;
|
2013-11-01 23:26:11 +04:00
|
|
|
sa_attrs = kmem_zalloc(sizeof (sa_bulk_attr_t) * 20, KM_SLEEP);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_MODE(zsb), NULL, &mode, 8);
|
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_SIZE(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&zp->z_size, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_GEN(zsb),
|
2016-05-12 23:31:55 +03:00
|
|
|
NULL, &zp->z_gen, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_UID(zsb), NULL, &uid, 8);
|
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_GID(zsb), NULL, &gid, 8);
|
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_PARENT(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
NULL, &parent, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_FLAGS(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&zp->z_pflags, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_ATIME(zsb), NULL,
|
Fix atime handling and relatime
The problem for atime:
We have 3 places for atime: inode->i_atime, znode->z_atime and SA. And its
handling is a mess. A huge part of mess regarding atime comes from
zfs_tstamp_update_setup, zfs_inode_update, and zfs_getattr, which behave
inconsistently with those three values.
zfs_tstamp_update_setup clears z_atime_dirty unconditionally as long as you
don't pass ATTR_ATIME. Which means every write(2) operation which only updates
ctime and mtime will cause atime changes to not be written to disk.
Also zfs_inode_update from write(2) will replace inode->i_atime with what's
inside SA(stale). But doesn't touch z_atime. So after read(2) and write(2).
You'll have i_atime(stale), z_atime(new), SA(stale) and z_atime_dirty=0.
Now, if you do stat(2), zfs_getattr will actually replace i_atime with what's
inside, z_atime. So you will have now you'll have i_atime(new), z_atime(new),
SA(stale) and z_atime_dirty=0. These will all gone after umount. And you'll
leave with a stale atime.
The problem for relatime:
We do have a relatime config inside ZFS dataset, but how it should interact
with the mount flag MS_RELATIME is not well defined. It seems it wanted
relatime mount option to override the dataset config by showing it as
temporary in `zfs get`. But at the same time, `zfs set relatime=on|off` would
also seems to want to override the mount option. Not to mention that
MS_RELATIME flag is actually never passed into ZFS, so it never really worked.
How Linux handles atime:
The Linux kernel actually handles atime completely in VFS, except for writing
it to disk. So if we remove the atime handling in ZFS, things would just work,
no matter it's strictatime, relatime, noatime, or even O_NOATIME. And whenever
VFS updates the i_atime, it will notify the underlying filesystem via
sb->dirty_inode().
And also there's one thing to note about atime flags like MS_RELATIME and
other flags like MS_NODEV, etc. They are mount point flags rather than
filesystem(sb) flags. Since native linux filesystem can be mounted at multiple
places at the same time, they can all have different atime settings. So these
flags are never passed down to filesystem drivers.
What this patch tries to do:
We remove znode->z_atime, since we won't gain anything from it. We remove most
of the atime handling and leave it to VFS. The only thing we do with atime is
to write it when dirty_inode() or setattr() is called. We also add
file_accessed() in zpl_read() since it's not provided in vfs_read().
After this patch, only the MS_RELATIME flag will have effect. The setting in
dataset won't do anything. We will make zfstuil to mount ZFS with MS_RELATIME
set according to the setting in dataset in future patch.
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4482
2016-03-30 03:53:34 +03:00
|
|
|
&atime, 16);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_MTIME(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&mtime, 16);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_CTIME(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&ctime, 16);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_CRTIME(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&crtime, 16);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_LINKS(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&zp->z_links, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
if (S_ISBLK(ZTOI(zp)->i_mode) || S_ISCHR(ZTOI(zp)->i_mode))
|
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_RDEV(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&rdev, 8);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_DACL_COUNT(zsb), NULL,
|
2010-05-29 00:45:14 +04:00
|
|
|
&zp->z_acl_cached->z_acl_count, 8);
|
|
|
|
|
|
|
|
if (zp->z_acl_cached->z_version < ZFS_ACL_VERSION_FUID)
|
|
|
|
zfs_acl_xform(zp, zp->z_acl_cached, CRED());
|
|
|
|
|
|
|
|
locate.cb_aclp = zp->z_acl_cached;
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_DACL_ACES(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
zfs_acl_data_locator, &locate, zp->z_acl_cached->z_acl_bytes);
|
2010-08-27 01:24:34 +04:00
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
if (xattr)
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_XATTR(zsb),
|
2010-08-27 01:24:34 +04:00
|
|
|
NULL, &xattr, 8);
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
/* if scanstamp then add scanstamp */
|
|
|
|
|
|
|
|
if (zp->z_pflags & ZFS_BONUS_SCANSTAMP) {
|
|
|
|
bcopy((caddr_t)db->db_data + ZFS_OLD_ZNODE_PHYS_SIZE,
|
|
|
|
scanstamp, AV_SCANSTAMP_SZ);
|
2011-02-08 22:16:06 +03:00
|
|
|
SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_SCANSTAMP(zsb),
|
2010-05-29 00:45:14 +04:00
|
|
|
NULL, scanstamp, AV_SCANSTAMP_SZ);
|
|
|
|
zp->z_pflags &= ~ZFS_BONUS_SCANSTAMP;
|
|
|
|
}
|
|
|
|
|
|
|
|
VERIFY(dmu_set_bonustype(db, DMU_OT_SA, tx) == 0);
|
|
|
|
VERIFY(sa_replace_all_by_template_locked(hdl, sa_attrs,
|
|
|
|
count, tx) == 0);
|
|
|
|
if (znode_acl.z_acl_extern_obj)
|
2011-02-08 22:16:06 +03:00
|
|
|
VERIFY(0 == dmu_object_free(zsb->z_os,
|
2010-05-29 00:45:14 +04:00
|
|
|
znode_acl.z_acl_extern_obj, tx));
|
|
|
|
|
|
|
|
zp->z_is_sa = B_TRUE;
|
2013-11-01 23:26:11 +04:00
|
|
|
kmem_free(sa_attrs, sizeof (sa_bulk_attr_t) * 20);
|
|
|
|
kmem_free(bulk, sizeof (sa_bulk_attr_t) * 20);
|
2010-08-27 01:24:34 +04:00
|
|
|
done:
|
|
|
|
if (drop_lock)
|
|
|
|
mutex_exit(&zp->z_lock);
|
2010-05-29 00:45:14 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
zfs_sa_upgrade_txholds(dmu_tx_t *tx, znode_t *zp)
|
|
|
|
{
|
2011-02-08 22:16:06 +03:00
|
|
|
if (!ZTOZSB(zp)->z_use_sa || zp->z_is_sa)
|
2010-05-29 00:45:14 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_TRUE);
|
|
|
|
|
2010-08-27 01:24:34 +04:00
|
|
|
if (zfs_external_acl(zp)) {
|
|
|
|
dmu_tx_hold_free(tx, zfs_external_acl(zp), 0,
|
2010-05-29 00:45:14 +04:00
|
|
|
DMU_OBJECT_END);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-27 21:15:42 +04:00
|
|
|
EXPORT_SYMBOL(zfs_attr_table);
|
2011-09-30 21:33:26 +04:00
|
|
|
EXPORT_SYMBOL(zfs_sa_readlink);
|
|
|
|
EXPORT_SYMBOL(zfs_sa_symlink);
|
|
|
|
EXPORT_SYMBOL(zfs_sa_get_scanstamp);
|
|
|
|
EXPORT_SYMBOL(zfs_sa_set_scanstamp);
|
2011-10-25 03:55:20 +04:00
|
|
|
EXPORT_SYMBOL(zfs_sa_get_xattr);
|
|
|
|
EXPORT_SYMBOL(zfs_sa_set_xattr);
|
2011-09-30 21:33:26 +04:00
|
|
|
EXPORT_SYMBOL(zfs_sa_upgrade);
|
|
|
|
EXPORT_SYMBOL(zfs_sa_upgrade_txholds);
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
#endif
|