When a user program updates a map value, every uptr will be pinned and
translated to an address in the kernel. This process is initiated by
calling bpf_map_update_elem() from user programs.
To access uptrs in BPF programs, they are pinned using
pin_user_pages_fast(), but the conversion to kernel addresses is actually
done by page_address(). The uptrs can be unpinned using unpin_user_pages().
Currently, the memory block pointed to by a uptr must reside in a single
memory page, as crossing multiple pages is not supported. uptr is only
supported by task storage maps and can only be set by user programs through
syscalls.
When the value of an uptr is overwritten or destroyed, the memory pointed
to by the old value must be unpinned. This is ensured by calling
bpf_obj_uptrcpy() and copy_map_uptr_locked() when updating map value and by
bpf_obj_free_fields() when destroying map value.
Cc: linux-mm@xxxxxxxxx
Signed-off-by: Kui-Feng Lee <thinker.li@xxxxxxxxx>
---
include/linux/bpf.h | 30 ++++++
kernel/bpf/bpf_local_storage.c | 23 ++++-
kernel/bpf/helpers.c | 20 ++++
kernel/bpf/syscall.c | 172 ++++++++++++++++++++++++++++++++-
4 files changed, 237 insertions(+), 8 deletions(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 954e476b5605..886c818ff555 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -477,6 +477,8 @@ static inline void bpf_long_memcpy(void *dst, const void *src, u32 size)
data_race(*ldst++ = *lsrc++);
}
+void bpf_obj_unpin_uptr(const struct btf_field *field, void *addr);
+
/* copy everything but bpf_spin_lock, bpf_timer, and kptrs. There could be one of each. */
static inline void bpf_obj_memcpy(struct btf_record *rec,
void *dst, void *src, u32 size,
@@ -503,6 +505,34 @@ static inline void bpf_obj_memcpy(struct btf_record *rec,
memcpy(dst + curr_off, src + curr_off, size - curr_off);
}
+static inline void bpf_obj_uptrcpy(struct btf_record *rec,
+ void *dst, void *src)
+{
+ int i;
+
+ if (IS_ERR_OR_NULL(rec))
+ return;
+
+ for (i = 0; i < rec->cnt; i++) {
+ u32 next_off = rec->fields[i].offset;
+ void *addr;
+
+ if (rec->fields[i].type == BPF_UPTR) {
+ /* Unpin old address.
+ *
+ * Alignments are guaranteed by btf_find_field_one().
+ */
+ addr = *(void **)(dst + next_off);
+ if (addr)
+ bpf_obj_unpin_uptr(&rec->fields[i], addr);
+
+ *(void **)(dst + next_off) = *(void **)(src + next_off);
+ }
+ }
+}
+
+void copy_map_uptr_locked(struct bpf_map *map, void *dst, void *src, bool lock_src);
+
static inline void copy_map_value(struct bpf_map *map, void *dst, void *src)
{
bpf_obj_memcpy(map->record, dst, src, map->value_size, false);
diff --git a/kernel/bpf/bpf_local_storage.c b/kernel/bpf/bpf_local_storage.c
index c938dea5ddbf..2fafad53b9d9 100644
--- a/kernel/bpf/bpf_local_storage.c
+++ b/kernel/bpf/bpf_local_storage.c
@@ -99,8 +99,11 @@ bpf_selem_alloc(struct bpf_local_storage_map *smap, void *owner,
}
if (selem) {
- if (value)
+ if (value) {
copy_map_value(&smap->map, SDATA(selem)->data, value);
+ if (smap->map.map_type == BPF_MAP_TYPE_TASK_STORAGE)
+ bpf_obj_uptrcpy(smap->map.record, SDATA(selem)->data, value);
+ }
/* No need to call check_and_init_map_value as memory is zero init */
return selem;
}
@@ -575,8 +578,13 @@ bpf_local_storage_update(void *owner, struct bpf_local_storage_map *smap,
if (err)
return ERR_PTR(err);
if (old_sdata && selem_linked_to_storage_lockless(SELEM(old_sdata))) {
- copy_map_value_locked(&smap->map, old_sdata->data,
- value, false);
+ if (smap->map.map_type == BPF_MAP_TYPE_TASK_STORAGE &&
+ btf_record_has_field(smap->map.record, BPF_UPTR))
+ copy_map_uptr_locked(&smap->map, old_sdata->data,
+ value, false);
+ else
+ copy_map_value_locked(&smap->map, old_sdata->data,
+ value, false);
return old_sdata;
}
}
@@ -607,8 +615,13 @@ bpf_local_storage_update(void *owner, struct bpf_local_storage_map *smap,
goto unlock;
if (old_sdata && (map_flags & BPF_F_LOCK)) {
- copy_map_value_locked(&smap->map, old_sdata->data, value,
- false);
+ if (smap->map.map_type == BPF_MAP_TYPE_TASK_STORAGE &&
+ btf_record_has_field(smap->map.record, BPF_UPTR))
+ copy_map_uptr_locked(&smap->map, old_sdata->data,
+ value, false);
+ else
+ copy_map_value_locked(&smap->map, old_sdata->data,
+ value, false);
selem = SELEM(old_sdata);
goto unlock;
}
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index d02ae323996b..d588b52605b9 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -388,6 +388,26 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,
preempt_enable();
}
+/* Copy map value and uptr from src to dst, with lock_src indicating
+ * whether src or dst is locked.
+ */
+void copy_map_uptr_locked(struct bpf_map *map, void *src, void *dst,
+ bool lock_src)
+{
+ struct bpf_spin_lock *lock;
+
+ if (lock_src)
+ lock = src + map->record->spin_lock_off;
+ else
+ lock = dst + map->record->spin_lock_off;
+ preempt_disable();
+ __bpf_spin_lock_irqsave(lock);
+ copy_map_value(map, dst, src);
+ bpf_obj_uptrcpy(map->record, dst, src);
+ __bpf_spin_unlock_irqrestore(lock);
+ preempt_enable();
+}
+
BPF_CALL_0(bpf_jiffies64)
{
return get_jiffies_64();
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index fed4a2145f81..1854aeb13ff7 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -155,8 +155,140 @@ static void maybe_wait_bpf_programs(struct bpf_map *map)
synchronize_rcu();
}
-static int bpf_map_update_value(struct bpf_map *map, struct file *map_file,
- void *key, void *value, __u64 flags)
+void bpf_obj_unpin_uptr(const struct btf_field *field, void *addr)
+{
+ struct page *pages[1];
+ u32 size, type_id;
+ int npages;
+ void *ptr;
+
+ type_id = field->kptr.btf_id;
+ btf_type_id_size(field->kptr.btf, &type_id, &size);
+ if (size == 0)
+ return;
+
+ ptr = (void *)((intptr_t)addr & PAGE_MASK);
+
+ npages = (((intptr_t)addr + size + ~PAGE_MASK) - (intptr_t)ptr) >> PAGE_SHIFT;
+ if (WARN_ON_ONCE(npages > 1))
+ return;
+
+ pages[0] = virt_to_page(ptr);
+ unpin_user_pages(pages, 1);
+}
+
+/* Unpin uptr fields in the record up to cnt */
+static void bpf_obj_unpin_uptrs_cnt(struct btf_record *rec, int cnt, void *src)
+{
+ u32 next_off;
+ void **kaddr_ptr;
+ int i;
+
+ for (i = 0; i < cnt; i++) {
+ if (rec->fields[i].type != BPF_UPTR)
+ continue;
+
+ next_off = rec->fields[i].offset;
+ kaddr_ptr = src + next_off;
+ if (*kaddr_ptr) {
+ bpf_obj_unpin_uptr(&rec->fields[i], *kaddr_ptr);
+ *kaddr_ptr = NULL;
+ }
+ }
+}
+
+/* Find all BPF_UPTR fields in the record, pin the user memory, map it
+ * to kernel space, and update the addresses in the source memory.
+ *
+ * The map value passing from userspace may contain user kptrs pointing to
+ * user memory. This function pins the user memory and maps it to kernel
+ * memory so that BPF programs can access it.
+ */
+static int bpf_obj_trans_pin_uptrs(struct btf_record *rec, void *src, u32 size)
+{
+ u32 type_id, tsz, npages, next_off;
+ void *uaddr, *kaddr, **uaddr_ptr;
+ const struct btf_type *t;
+ struct page *pages[1];
+ int i, err;
+
+ if (IS_ERR_OR_NULL(rec))
+ return 0;
+
+ if (!btf_record_has_field(rec, BPF_UPTR))
+ return 0;
+
+ for (i = 0; i < rec->cnt; i++) {
+ if (rec->fields[i].type != BPF_UPTR)
+ continue;
+
+ next_off = rec->fields[i].offset;
+ if (next_off + sizeof(void *) > size) {
+ err = -EFAULT;
+ goto rollback;
+ }
+ uaddr_ptr = src + next_off;
+ uaddr = *uaddr_ptr;
+ if (!uaddr)
+ continue;
+
+ /* Make sure the user memory takes up at most one page */
+ type_id = rec->fields[i].kptr.btf_id;
+ t = btf_type_id_size(rec->fields[i].kptr.btf, &type_id, &tsz);
+ if (!t) {
+ err = -EFAULT;
+ goto rollback;
+ }
+ if (tsz == 0) {
+ *uaddr_ptr = NULL;
+ continue;
+ }
+ npages = (((intptr_t)uaddr + tsz + ~PAGE_MASK) -
+ ((intptr_t)uaddr & PAGE_MASK)) >> PAGE_SHIFT;
+ if (npages > 1) {
+ /* Allow only one page */
+ err = -EFAULT;
+ goto rollback;
+ }
+
+ /* Pin the user memory */
+ err = pin_user_pages_fast((intptr_t)uaddr, 1, FOLL_LONGTERM | FOLL_WRITE, pages);
+ if (err < 0)
+ goto rollback;
+
+ /* Map to kernel space */
+ kaddr = page_address(pages[0]);
+ if (unlikely(!kaddr)) {
+ WARN_ON_ONCE(1);
+ unpin_user_pages(pages, 1);
+ err = -EFAULT;
+ goto rollback;
+ }
+ *uaddr_ptr = kaddr + ((intptr_t)uaddr & ~PAGE_MASK);
+ }
+
+ return 0;
+
+rollback:
+ /* Unpin the user memory of earlier fields */
+ bpf_obj_unpin_uptrs_cnt(rec, i, src);
+
+ return err;
+}
+
+static void bpf_obj_unpin_uptrs(struct btf_record *rec, void *src)
+{
+ if (IS_ERR_OR_NULL(rec))
+ return;
+
+ if (!btf_record_has_field(rec, BPF_UPTR))
+ return;
+
+ bpf_obj_unpin_uptrs_cnt(rec, rec->cnt, src);
+}
+
+static int bpf_map_update_value_inner(struct bpf_map *map, struct file *map_file,
+ void *key, void *value, __u64 flags)
{
int err;
@@ -208,6 +340,29 @@ static int bpf_map_update_value(struct bpf_map *map, struct file *map_file,
return err;
}
+static int bpf_map_update_value(struct bpf_map *map, struct file *map_file,
+ void *key, void *value, __u64 flags)
+{
+ int err;
+
+ if (map->map_type == BPF_MAP_TYPE_TASK_STORAGE) {
+ /* Pin user memory can lead to context switch, so we need
+ * to do it before potential RCU lock.
+ */
+ err = bpf_obj_trans_pin_uptrs(map->record, value,
+ bpf_map_value_size(map));
+ if (err)
+ return err;
+ }
+
+ err = bpf_map_update_value_inner(map, map_file, key, value, flags);
+
+ if (err && map->map_type == BPF_MAP_TYPE_TASK_STORAGE)
+ bpf_obj_unpin_uptrs(map->record, value);
+
+ return err;
+}
+
static int bpf_map_copy_value(struct bpf_map *map, void *key, void *value,
__u64 flags)
{
@@ -714,6 +869,11 @@ void bpf_obj_free_fields(const struct btf_record *rec, void *obj)
field->kptr.dtor(xchgd_field);
}
break;
+ case BPF_UPTR:
+ if (*(void **)field_ptr)
+ bpf_obj_unpin_uptr(field, *(void **)field_ptr);
+ *(void **)field_ptr = NULL;
+ break;
case BPF_LIST_HEAD:
if (WARN_ON_ONCE(rec->spin_lock_off < 0))
continue;
@@ -1099,7 +1259,7 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token,
map->record = btf_parse_fields(btf, value_type,
BPF_SPIN_LOCK | BPF_TIMER | BPF_KPTR | BPF_LIST_HEAD |
- BPF_RB_ROOT | BPF_REFCOUNT | BPF_WORKQUEUE,
+ BPF_RB_ROOT | BPF_REFCOUNT | BPF_WORKQUEUE | BPF_UPTR,
map->value_size);
if (!IS_ERR_OR_NULL(map->record)) {
int i;
@@ -1155,6 +1315,12 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token,
goto free_map_tab;
}
break;
+ case BPF_UPTR:
+ if (map->map_type != BPF_MAP_TYPE_TASK_STORAGE) {
+ ret = -EOPNOTSUPP;
+ goto free_map_tab;
+ }
+ break;
case BPF_LIST_HEAD:
case BPF_RB_ROOT:
if (map->map_type != BPF_MAP_TYPE_HASH &&
--
2.34.1
