Skip to contentSkip to conversation

tpm: use GFP kernel for tpm_buf allocations

PATCH In review James Bottomley 2 participants 3 messages Oct 11, 2019 – Oct 14, 2019

Subsystems (2)
lore
Share & tools
lore

James Bottomley

author maintainer
#0 lore raw

PATCH v2 1/1 tpm: use GFP kernel for tpm_buf allocations

The current code uses GFP_HIGHMEM, which is wrong because GFP_HIGHMEM (on 32 bit systems) is memory ordinarily inaccessible to the kernel and should only be used for allocations affecting userspace. In order to make highmem visible to the kernel on 32 bit it has to be kmapped, which consumes valuable entries in the kmap region. Since the tpm_buf is only ever used in the kernel, switch to using a GFP_KERNEL allocation so as not to waste kmap space on 32 bits.

Fixes a74f8b36352e (tpm: introduce tpm_buf)

---

v2: fix 0day spotted problem with free_page taking an unsigned long
not a void *

---
 drivers/char/tpm/tpm.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/char/tpm/tpm.h +3 -6
index a7fea3e0ca86..3a7998d7309a 100644
@@ -284,7 +284,6 @@ enum tpm_buf_flags {
 };
 
 struct tpm_buf {
-	struct page *data_page;
 	unsigned int flags;
 	u8 *data;
 };
@@ -300,20 +299,18 @@ static inline void tpm_buf_reset(struct tpm_buf *buf, u16 tag, u32 ordinal)
 
 static inline int tpm_buf_init(struct tpm_buf *buf, u16 tag, u32 ordinal)
 {
-	buf->data_page = alloc_page(GFP_HIGHUSER);
-	if (!buf->data_page)
+	buf->data = (u8 *)__get_free_page(GFP_KERNEL);
+	if (!buf->data)
 		return -ENOMEM;
 
 	buf->flags = 0;
-	buf->data = kmap(buf->data_page);
 	tpm_buf_reset(buf, tag, ordinal);
 	return 0;
 }
 
 static inline void tpm_buf_destroy(struct tpm_buf *buf)
 {
-	kunmap(buf->data_page);
-	__free_page(buf->data_page);
+	free_page((unsigned long)buf->data);
 }
 
 static inline u32 tpm_buf_length(struct tpm_buf *buf)
Signature · 1 line
2.16.4
#1 lore raw
Quoted 8 lines · James Bottomley

The current code uses GFP_HIGHMEM, which is wrong because GFP_HIGHMEM (on 32 bit systems) is memory ordinarily inaccessible to the kernel and should only be used for allocations affecting userspace. In order to make highmem visible to the kernel on 32 bit it has to be kmapped, which consumes valuable entries in the kmap region. Since the tpm_buf is only ever used in the kernel, switch to using a GFP_KERNEL allocation so as not to waste kmap space on 32 bits.

Quoted 4 lines
Fixes a74f8b36352e (tpm: introduce tpm_buf)

I'll apply this without a fixes tag as there is no failing system. Agree that it was not the best design decision to use GFP_HIGHMEM.

/Jarkko

author maintainer
#2 lore raw
Quoted 13 lines · Jarkko Sakkinen
Quoted 12 lines · James Bottomley

The current code uses GFP_HIGHMEM, which is wrong because GFP_HIGHMEM
(on 32 bit systems) is memory ordinarily inaccessible to the kernel and should only be used for allocations affecting userspace. In order
to make highmem visible to the kernel on 32 bit it has to be kmapped,
which consumes valuable entries in the kmap region. Since the tpm_buf
is only ever used in the kernel, switch to using a GFP_KERNEL allocation so as not to waste kmap space on 32 bits.

Quoted 8 lines
Quoted 5 lines
Fixes a74f8b36352e (tpm: introduce tpm_buf)

om>

I'll apply this without a fixes tag as there is no failing system. Agree that it was not the best design decision to use GFP_HIGHMEM.

I don't really mind either way. The function of the fixes tag isn't to say there was a fatal bug it's to say if you think you're fixing something where was the origin of the problem, however minor the problem is.

I do agree that Sasha's autosel stuff does seem to be triggering off Fixes and we don't want to see hundreds of autosel patches trying to apply this to older trees, so removing the fixes tag to avoid this is fine with me.

James