Skip to content

xe: Fix CFI violation when accessing sysfs files #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JeevakaPrabu wants to merge 1 commit into
base: a15/dev
Choose a base branch
from
Open

xe: Fix CFI violation when accessing sysfs files #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 41 additions & 32 deletions drivers/gpu/drm/xe/xe_gt_freq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ dev_to_xe(struct device *dev)
return gt_to_xe(kobj_to_gt(dev->kobj.parent));
}

static ssize_t act_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t act_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;

Expand All @@ -68,11 +69,12 @@ static ssize_t act_freq_show(struct device *dev,

return sysfs_emit(buf, "%d\n", freq);
}
static DEVICE_ATTR_RO(act_freq);
static struct kobj_attribute act_freq_attr = __ATTR_RO(act_freq);

static ssize_t cur_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t cur_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;
ssize_t ret;
Expand All @@ -85,11 +87,12 @@ static ssize_t cur_freq_show(struct device *dev,

return sysfs_emit(buf, "%d\n", freq);
}
static DEVICE_ATTR_RO(cur_freq);
static struct kobj_attribute cur_freq_attr = __ATTR_RO(cur_freq);

static ssize_t rp0_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t rp0_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;

Expand All @@ -99,11 +102,12 @@ static ssize_t rp0_freq_show(struct device *dev,

return sysfs_emit(buf, "%d\n", freq);
}
static DEVICE_ATTR_RO(rp0_freq);
static struct kobj_attribute rp0_freq_attr = __ATTR_RO(rp0_freq);

static ssize_t rpe_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t rpe_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;

Expand All @@ -113,20 +117,22 @@ static ssize_t rpe_freq_show(struct device *dev,

return sysfs_emit(buf, "%d\n", freq);
}
static DEVICE_ATTR_RO(rpe_freq);
static struct kobj_attribute rpe_freq_attr = __ATTR_RO(rpe_freq);

static ssize_t rpn_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t rpn_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);

return sysfs_emit(buf, "%d\n", xe_guc_pc_get_rpn_freq(pc));
}
static DEVICE_ATTR_RO(rpn_freq);
static struct kobj_attribute rpn_freq_attr = __ATTR_RO(rpn_freq);

static ssize_t min_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t min_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;
ssize_t ret;
Expand All @@ -140,9 +146,10 @@ static ssize_t min_freq_show(struct device *dev,
return sysfs_emit(buf, "%d\n", freq);
}

static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr,
const char *buff, size_t count)
static ssize_t min_freq_store(struct kobject *kobj,
struct kobj_attribute *attr, const char *buff, size_t count)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;
ssize_t ret;
Expand All @@ -159,11 +166,12 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr,

return count;
}
static DEVICE_ATTR_RW(min_freq);
static struct kobj_attribute min_freq_attr = __ATTR_RW(min_freq);

static ssize_t max_freq_show(struct device *dev,
struct device_attribute *attr, char *buf)
static ssize_t max_freq_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;
ssize_t ret;
Expand All @@ -177,9 +185,10 @@ static ssize_t max_freq_show(struct device *dev,
return sysfs_emit(buf, "%d\n", freq);
}

static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
const char *buff, size_t count)
static ssize_t max_freq_store(struct kobject *kobj,
struct kobj_attribute *attr, const char *buff, size_t count)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_guc_pc *pc = dev_to_pc(dev);
u32 freq;
ssize_t ret;
Expand All @@ -196,16 +205,16 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,

return count;
}
static DEVICE_ATTR_RW(max_freq);
static struct kobj_attribute max_freq_attr = __ATTR_RW(max_freq);

static const struct attribute *freq_attrs[] = {
&dev_attr_act_freq.attr,
&dev_attr_cur_freq.attr,
&dev_attr_rp0_freq.attr,
&dev_attr_rpe_freq.attr,
&dev_attr_rpn_freq.attr,
&dev_attr_min_freq.attr,
&dev_attr_max_freq.attr,
&act_freq_attr.attr,
&cur_freq_attr.attr,
&rp0_freq_attr.attr,
&rpe_freq_attr.attr,
&rpn_freq_attr.attr,
&min_freq_attr.attr,
&max_freq_attr.attr,
NULL
};

Expand Down
27 changes: 15 additions & 12 deletions drivers/gpu/drm/xe/xe_gt_idle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,10 @@ int xe_gt_idle_pg_print(struct xe_gt *gt, struct drm_printer *p)
return 0;
}

static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buff)
static ssize_t name_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_gt_idle *gtidle = dev_to_gtidle(dev);
struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
ssize_t ret;
Expand All @@ -258,11 +259,12 @@ static ssize_t name_show(struct device *dev,

return ret;
}
static DEVICE_ATTR_RO(name);
static struct kobj_attribute name_attr = __ATTR_RO(name);

static ssize_t idle_status_show(struct device *dev,
struct device_attribute *attr, char *buff)
static ssize_t idle_status_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_gt_idle *gtidle = dev_to_gtidle(dev);
struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
enum xe_gt_idle_state state;
Expand All @@ -273,11 +275,12 @@ static ssize_t idle_status_show(struct device *dev,

return sysfs_emit(buff, "%s\n", gt_idle_state_to_string(state));
}
static DEVICE_ATTR_RO(idle_status);
static struct kobj_attribute idle_status_attr = __ATTR_RO(idle_status);

static ssize_t idle_residency_ms_show(struct device *dev,
struct device_attribute *attr, char *buff)
static ssize_t idle_residency_ms_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
struct device *dev = kobj_to_dev(kobj);
struct xe_gt_idle *gtidle = dev_to_gtidle(dev);
struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
u64 residency;
Expand All @@ -288,12 +291,12 @@ static ssize_t idle_residency_ms_show(struct device *dev,

return sysfs_emit(buff, "%llu\n", get_residency_ms(gtidle, residency));
}
static DEVICE_ATTR_RO(idle_residency_ms);
static struct kobj_attribute idle_residency_attr = __ATTR_RO(idle_residency_ms);

static const struct attribute *gt_idle_attrs[] = {
&dev_attr_name.attr,
&dev_attr_idle_status.attr,
&dev_attr_idle_residency_ms.attr,
&name_attr.attr,
&idle_status_attr.attr,
&idle_residency_attr.attr,
NULL,
};

Expand Down