lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 046/211] vTPM: fix memory allocation flag for rtce buffer at kernel boot
    Date
    4.2.8-ckt1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Hon Ching \\\\(Vicky\\\\) Lo" <honclo@linux.vnet.ibm.com>

    commit 60ecd86c4d985750efa0ea3d8610972b09951715 upstream.

    At ibm vtpm initialzation, tpm_ibmvtpm_probe() registers its interrupt
    handler, ibmvtpm_interrupt, which calls ibmvtpm_crq_process to allocate
    memory for rtce buffer. The current code uses 'GFP_KERNEL' as the
    type of kernel memory allocation, which resulted a warning at
    kernel/lockdep.c. This patch uses 'GFP_ATOMIC' instead so that the
    allocation is high-priority and does not sleep.

    Signed-off-by: Hon Ching(Vicky) Lo <honclo@linux.vnet.ibm.com>
    Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
    index 27ebf95..3e6a226 100644
    --- a/drivers/char/tpm/tpm_ibmvtpm.c
    +++ b/drivers/char/tpm/tpm_ibmvtpm.c
    @@ -491,7 +491,7 @@ static void ibmvtpm_crq_process(struct ibmvtpm_crq *crq,
    }
    ibmvtpm->rtce_size = be16_to_cpu(crq->len);
    ibmvtpm->rtce_buf = kmalloc(ibmvtpm->rtce_size,
    - GFP_KERNEL);
    + GFP_ATOMIC);
    if (!ibmvtpm->rtce_buf) {
    dev_err(ibmvtpm->dev, "Failed to allocate memory for rtce buffer\n");
    return;
    --
    1.9.1


    \
     
     \ /
      Last update: 2016-01-05 21:01    [W:5.886 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site