From nobody Wed Apr 29 02:01:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 520CDC433EF for ; Wed, 25 May 2022 22:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344883AbiEYWTZ (ORCPT ); Wed, 25 May 2022 18:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbiEYWTT (ORCPT ); Wed, 25 May 2022 18:19:19 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C3A5674F2 for ; Wed, 25 May 2022 15:19:18 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id bo5so167247pfb.4 for ; Wed, 25 May 2022 15:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wccjosb8wE1V/MYd73MboMsy8MfUDLYZI409lQYQVEM=; b=LEEEpCI1j7qkx0EGkLbiue2FsrBjxh2KwXKW6ZBOEkQKTEcF18Di/jMced8MbqFXcr 6L3YQ+AiFlUNitJ8J6O6gjwMInwS7WSRrVwPJJf1HdjLVaLsES8Ehf0BwLCt+g3BWeYl 7x7e+LIizvbSQco6C6eOVFKZV+VK7SUY2Jd/4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wccjosb8wE1V/MYd73MboMsy8MfUDLYZI409lQYQVEM=; b=6XE422DCpdWmH+fo7GWnzZLHBEYN6Paep/VW5UpP6fn1JOSv+yrxj3vfBUZiYRIfgI StXY+YgPtu12ASX1oyrcRHC/GBQRogfqRgkPThLYDqWq1xLfVaiUdfVctCaJKY1VKDUN 4M2GcwYZsbSWEsiLnLi3292kn12rJafqv8oSexw3pcl24VjJI8a9NOQN2mqIvhiYzvrR Bvd4So6UpqiBRMmo2kJWEQ2sCdBYb1YaX3fKgSekGArEk6OCmr1dfClr6VmoXSSiILMZ 162xWR/NW33NYsFK0Gju4Pt6C2Ol111xTgSXQwb7thfvTh2blBYq40lkD/bKpeq026u1 3Icg== X-Gm-Message-State: AOAM532K9N0Y3DTidCU8dIgzn+92/qyFtPXPyfbogktai0sSCJQ5zlDA uV+eyfxizRhzFC1HNtKCzJIpLk96eWqhCw== X-Google-Smtp-Source: ABdhPJyqH/pFtyzZN0+TTUQ5L+yo+rcr9UoI8vmlcIzhRSepo77v0l0tVNpTbVesHOThrvjl3mkPKw== X-Received: by 2002:aa7:8390:0:b0:518:3f2d:1e2 with SMTP id u16-20020aa78390000000b005183f2d01e2mr34558419pfm.36.1653517157612; Wed, 25 May 2022 15:19:17 -0700 (PDT) Received: from localhost (132.111.125.34.bc.googleusercontent.com. [34.125.111.132]) by smtp.gmail.com with UTF8SMTPSA id w5-20020a170902e88500b0015e8d4eb1d3sm10003803plg.29.2022.05.25.15.19.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 May 2022 15:19:17 -0700 (PDT) From: pso@chromium.org To: LKML Cc: Dmitry Torokhov , Paramjit Oberoi , Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck Subject: [PATCH] pstore/ram: Fix pmsg address when per-cpu ftrace buffers are enabled Date: Wed, 25 May 2022 15:18:55 -0700 Message-Id: <20220525151809.1.I43128ef59eb08247ec093f8b19d05aa91f721afb@changeid> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Paramjit Oberoi When allocating ftrace pstore zones, there may be space left over at the end of the region. The paddr pointer needs to be advanced to account for this so that the next region (pmsg) ends up at the correct location. Signed-off-by: Paramjit Oberoi Reviewed-by: Dmitry Torokhov --- fs/pstore/ram.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index fefe3d391d3af..3bca6cd34c02a 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -554,10 +554,12 @@ static int ramoops_init_przs(const char *name, goto fail; } *paddr +=3D zone_sz; + mem_sz -=3D zone_sz; prz_ar[i]->type =3D pstore_name_to_type(name); } =20 *przs =3D prz_ar; + *paddr +=3D mem_sz; return 0; =20 fail: --=20 2.36.1.124.g0e6072fb45-goog