mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 23:45:31 +08:00
6da2ec5605
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This patch replaces cases of: kmalloc(a * b, gfp) with: kmalloc_array(a * b, gfp) as well as handling cases of: kmalloc(a * b * c, gfp) with: kmalloc(array3_size(a, b, c), gfp) as it's slightly less ugly than: kmalloc_array(array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: kmalloc(4 * 1024, gfp) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. The tools/ directory was manually excluded, since it has its own implementation of kmalloc(). The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ type TYPE; expression THING, E; @@ ( kmalloc( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | kmalloc( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( kmalloc( - sizeof(u8) * (COUNT) + COUNT , ...) | kmalloc( - sizeof(__u8) * (COUNT) + COUNT , ...) | kmalloc( - sizeof(char) * (COUNT) + COUNT , ...) | kmalloc( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | kmalloc( - sizeof(u8) * COUNT + COUNT , ...) | kmalloc( - sizeof(__u8) * COUNT + COUNT , ...) | kmalloc( - sizeof(char) * COUNT + COUNT , ...) | kmalloc( - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - kmalloc + kmalloc_array ( - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ - kmalloc + kmalloc_array ( - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( kmalloc( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kmalloc( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kmalloc( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kmalloc( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kmalloc( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kmalloc( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kmalloc( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kmalloc( - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( kmalloc( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kmalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kmalloc( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kmalloc( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kmalloc( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | kmalloc( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ identifier STRIDE, SIZE, COUNT; @@ ( kmalloc( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kmalloc( - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression E1, E2, E3; constant C1, C2, C3; @@ ( kmalloc(C1 * C2 * C3, ...) | kmalloc( - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | kmalloc( - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | kmalloc( - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | kmalloc( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( kmalloc(sizeof(THING) * C2, ...) | kmalloc(sizeof(TYPE) * C2, ...) | kmalloc(C1 * C2 * C3, ...) | kmalloc(C1 * C2, ...) | - kmalloc + kmalloc_array ( - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - kmalloc + kmalloc_array ( - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - kmalloc + kmalloc_array ( - (E1) * E2 + E1, E2 , ...) | - kmalloc + kmalloc_array ( - (E1) * (E2) + E1, E2 , ...) | - kmalloc + kmalloc_array ( - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>
140 lines
3.0 KiB
C
140 lines
3.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Hypervisor filesystem for Linux on s390
|
|
*
|
|
* Diag 0C implementation
|
|
*
|
|
* Copyright IBM Corp. 2014
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/cpu.h>
|
|
#include <asm/diag.h>
|
|
#include <asm/hypfs.h>
|
|
#include "hypfs.h"
|
|
|
|
#define DBFS_D0C_HDR_VERSION 0
|
|
|
|
/*
|
|
* Execute diagnose 0c in 31 bit mode
|
|
*/
|
|
static void diag0c(struct hypfs_diag0c_entry *entry)
|
|
{
|
|
diag_stat_inc(DIAG_STAT_X00C);
|
|
asm volatile (
|
|
" sam31\n"
|
|
" diag %0,%0,0x0c\n"
|
|
" sam64\n"
|
|
: /* no output register */
|
|
: "a" (entry)
|
|
: "memory");
|
|
}
|
|
|
|
/*
|
|
* Get hypfs_diag0c_entry from CPU vector and store diag0c data
|
|
*/
|
|
static void diag0c_fn(void *data)
|
|
{
|
|
diag0c(((void **) data)[smp_processor_id()]);
|
|
}
|
|
|
|
/*
|
|
* Allocate buffer and store diag 0c data
|
|
*/
|
|
static void *diag0c_store(unsigned int *count)
|
|
{
|
|
struct hypfs_diag0c_data *diag0c_data;
|
|
unsigned int cpu_count, cpu, i;
|
|
void **cpu_vec;
|
|
|
|
get_online_cpus();
|
|
cpu_count = num_online_cpus();
|
|
cpu_vec = kmalloc_array(num_possible_cpus(), sizeof(*cpu_vec),
|
|
GFP_KERNEL);
|
|
if (!cpu_vec)
|
|
goto fail_put_online_cpus;
|
|
/* Note: Diag 0c needs 8 byte alignment and real storage */
|
|
diag0c_data = kzalloc(sizeof(struct hypfs_diag0c_hdr) +
|
|
cpu_count * sizeof(struct hypfs_diag0c_entry),
|
|
GFP_KERNEL | GFP_DMA);
|
|
if (!diag0c_data)
|
|
goto fail_kfree_cpu_vec;
|
|
i = 0;
|
|
/* Fill CPU vector for each online CPU */
|
|
for_each_online_cpu(cpu) {
|
|
diag0c_data->entry[i].cpu = cpu;
|
|
cpu_vec[cpu] = &diag0c_data->entry[i++];
|
|
}
|
|
/* Collect data all CPUs */
|
|
on_each_cpu(diag0c_fn, cpu_vec, 1);
|
|
*count = cpu_count;
|
|
kfree(cpu_vec);
|
|
put_online_cpus();
|
|
return diag0c_data;
|
|
|
|
fail_kfree_cpu_vec:
|
|
kfree(cpu_vec);
|
|
fail_put_online_cpus:
|
|
put_online_cpus();
|
|
return ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
/*
|
|
* Hypfs DBFS callback: Free diag 0c data
|
|
*/
|
|
static void dbfs_diag0c_free(const void *data)
|
|
{
|
|
kfree(data);
|
|
}
|
|
|
|
/*
|
|
* Hypfs DBFS callback: Create diag 0c data
|
|
*/
|
|
static int dbfs_diag0c_create(void **data, void **data_free_ptr, size_t *size)
|
|
{
|
|
struct hypfs_diag0c_data *diag0c_data;
|
|
unsigned int count;
|
|
|
|
diag0c_data = diag0c_store(&count);
|
|
if (IS_ERR(diag0c_data))
|
|
return PTR_ERR(diag0c_data);
|
|
memset(&diag0c_data->hdr, 0, sizeof(diag0c_data->hdr));
|
|
get_tod_clock_ext(diag0c_data->hdr.tod_ext);
|
|
diag0c_data->hdr.len = count * sizeof(struct hypfs_diag0c_entry);
|
|
diag0c_data->hdr.version = DBFS_D0C_HDR_VERSION;
|
|
diag0c_data->hdr.count = count;
|
|
*data = diag0c_data;
|
|
*data_free_ptr = diag0c_data;
|
|
*size = diag0c_data->hdr.len + sizeof(struct hypfs_diag0c_hdr);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Hypfs DBFS file structure
|
|
*/
|
|
static struct hypfs_dbfs_file dbfs_file_0c = {
|
|
.name = "diag_0c",
|
|
.data_create = dbfs_diag0c_create,
|
|
.data_free = dbfs_diag0c_free,
|
|
};
|
|
|
|
/*
|
|
* Initialize diag 0c interface for z/VM
|
|
*/
|
|
int __init hypfs_diag0c_init(void)
|
|
{
|
|
if (!MACHINE_IS_VM)
|
|
return 0;
|
|
return hypfs_dbfs_create_file(&dbfs_file_0c);
|
|
}
|
|
|
|
/*
|
|
* Shutdown diag 0c interface for z/VM
|
|
*/
|
|
void hypfs_diag0c_exit(void)
|
|
{
|
|
if (!MACHINE_IS_VM)
|
|
return;
|
|
hypfs_dbfs_remove_file(&dbfs_file_0c);
|
|
}
|