mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
Merge tag 'kvm-x86-generic-6.17' of https://github.com/kvm-x86/linux into HEAD
KVM generic changes for 6.17 - Add a tracepoint for KVM_SET_MEMORY_ATTRIBUTES to help debug issues related to private <=> shared memory conversions. - Drop guest_memfd's .getattr() implementation as the VFS layer will call generic_fillattr() if inode_operations.getattr is NULL.
This commit is contained in:
@@ -382,23 +382,12 @@ static const struct address_space_operations kvm_gmem_aops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static int kvm_gmem_getattr(struct mnt_idmap *idmap, const struct path *path,
|
||||
struct kstat *stat, u32 request_mask,
|
||||
unsigned int query_flags)
|
||||
{
|
||||
struct inode *inode = path->dentry->d_inode;
|
||||
|
||||
generic_fillattr(idmap, request_mask, inode, stat);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int kvm_gmem_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
|
||||
struct iattr *attr)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
static const struct inode_operations kvm_gmem_iops = {
|
||||
.getattr = kvm_gmem_getattr,
|
||||
.setattr = kvm_gmem_setattr,
|
||||
};
|
||||
|
||||
|
||||
@@ -2558,9 +2558,11 @@ static int kvm_vm_set_mem_attributes(struct kvm *kvm, gfn_t start, gfn_t end,
|
||||
|
||||
entry = attributes ? xa_mk_value(attributes) : NULL;
|
||||
|
||||
trace_kvm_vm_set_mem_attributes(start, end, attributes);
|
||||
|
||||
mutex_lock(&kvm->slots_lock);
|
||||
|
||||
/* Nothing to do if the entire range as the desired attributes. */
|
||||
/* Nothing to do if the entire range has the desired attributes. */
|
||||
if (kvm_range_has_memory_attributes(kvm, start, end, ~0, attributes))
|
||||
goto out_unlock;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user