Skip to content

Commit

Permalink
vdso/namespace: Rename timens_setup_vdso_data() to reflect new vdso_c…
Browse files Browse the repository at this point in the history
…lock struct

To support multiple PTP clocks, the VDSO data structure needs to be
reworked. All clock specific data will end up in struct vdso_clock and in
struct vdso_time_data there will be array of VDSO clocks. At the moment,
vdso_clock is simply a define which maps vdso_clock to vdso_time_data.

For time namespaces, vdso_time_data needs to be set up. But only the clock
related part of the vdso_data thats requires this setup. To reflect the
future struct vdso_clock, rename timens_setup_vdso_data() to
timns_setup_vdso_clock_data().

No functional change.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250303-vdso-clock-v1-13-c1b5c69a166f@linutronix.de
  • Loading branch information
Anna-Maria Behnsen authored and Thomas Gleixner committed Mar 8, 2025
1 parent b5afbc1 commit 0235220
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions kernel/time/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ static struct timens_offset offset_from_ts(struct timespec64 off)
* Timens page has vdso_time_data->clock_mode set to VDSO_CLOCKMODE_TIMENS which
* enforces the time namespace handling path.
*/
static void timens_setup_vdso_data(struct vdso_time_data *vdata,
struct time_namespace *ns)
static void timens_setup_vdso_clock_data(struct vdso_time_data *vdata,
struct time_namespace *ns)
{
struct timens_offset *offset = vdata->offset;
struct timens_offset monotonic = offset_from_ts(ns->offsets.monotonic);
Expand Down Expand Up @@ -238,7 +238,7 @@ static void timens_set_vvar_page(struct task_struct *task,
vdata = page_address(ns->vvar_page);

for (i = 0; i < CS_BASES; i++)
timens_setup_vdso_data(&vdata[i], ns);
timens_setup_vdso_clock_data(&vdata[i], ns);

out:
mutex_unlock(&offset_lock);
Expand Down
2 changes: 1 addition & 1 deletion lib/vdso/datastore.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, unsigned
* non-root time namespace. Whenever a task changes its namespace, the VVAR
* page tables are cleared and then they will be re-faulted with a
* corresponding layout.
* See also the comment near timens_setup_vdso_data() for details.
* See also the comment near timens_setup_vdso_clock_data() for details.
*/
int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
{
Expand Down

0 comments on commit 0235220

Please sign in to comment.