From patchwork Tue Oct 11 18:36:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pso@chromium.org X-Patchwork-Id: 13004247 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 8A811C4332F for ; Tue, 11 Oct 2022 18:40:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229780AbiJKSkw (ORCPT ); Tue, 11 Oct 2022 14:40:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbiJKSku (ORCPT ); Tue, 11 Oct 2022 14:40:50 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3795A7CB76 for ; Tue, 11 Oct 2022 11:40:48 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id n7so14068114plp.1 for ; Tue, 11 Oct 2022 11:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ERLKnWgpFtVqzoSU44W3worzEWB0a03vIi6zG/hd2Qc=; b=QFQN5rlHiCyzloNEdPEFYRYrZd0bqEgI0E75b7bEfoPe3yqTD/6k3wsCxOOYiGCi9R ZpvjE1KUK6t/pcibjKoOk/quG5n30LkGUcE+v7gtdTrB+WeyxZulcozSlPrCcW+pY+AV wqVCdjaqyyerDT2MbPxlEKIOwcdJwbKVsQXgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ERLKnWgpFtVqzoSU44W3worzEWB0a03vIi6zG/hd2Qc=; b=k3WGnMpPHRfZRacJg3RKSRa9zwsbP8ZyOSv+lPnb+QwM24A+OlGKLIXKnlyYmH78ZG JRQAXiJZZccwiR7mKUPfWzENQloakQaA6mwhXAZ4tZKVksKsfXwrSBfAan97OINM6nN2 W9XiYd5fUpBCICa+xIYw8idmnKj5vnuVGrFOPb96ArdlNsjsCe/CDC0kUm4GgyuuqO4a JLfajKYxwPQiWNw5bfHUFJ4J5/9JijxWAuYOA1j6BUkEwU7kVq89N5Bw3b/1UNZntHCx d0J0ytJif8z2bDmGzJ2XuTkKkc3iNRxDKS41zkJ8x+mB1xk7qxQPY5nWMvwW+YeRidwX OhNQ== X-Gm-Message-State: ACrzQf2tRLyar5/XQ9T9jxpxZ0Afo7GdnIdo0/67x/yHZ/ZcVRZ2RV4r 9dIolfzDS4OUq+lkzqZxuVGgOA== X-Google-Smtp-Source: AMsMyM5X65We0X/Ht0ZSbcTFw63RgxlYYbI+FE7dMqtjj305K9Zf1bAk4DBv3Sh3Eenfm8k5K/NJSw== X-Received: by 2002:a17:90b:4c52:b0:20d:7917:4cb3 with SMTP id np18-20020a17090b4c5200b0020d79174cb3mr613006pjb.6.1665513648289; Tue, 11 Oct 2022 11:40:48 -0700 (PDT) Received: from localhost (226.75.127.34.bc.googleusercontent.com. [34.127.75.226]) by smtp.gmail.com with UTF8SMTPSA id w4-20020a170902ca0400b0017eea4a3979sm8860022pld.154.2022.10.11.11.40.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Oct 2022 11:40:48 -0700 (PDT) From: pso@chromium.org To: LKML , Linux-Fsdevel Cc: Kees Cook , Dmitry Torokhov , Paramjit Oberoi , Paramjit Oberoi , Anton Vorontsov , Colin Cross , Tony Luck Subject: [PATCH 1/1] pstore/ram: Ensure stable pmsg address with per-CPU ftrace buffers Date: Tue, 11 Oct 2022 11:36:31 -0700 Message-Id: <20221011113511.1.I1cf52674cd85d07b300fe3fff3ad6ce830304bb6@changeid> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20221011183630.3113666-1-pso@chromium.org> References: <20221011183630.3113666-1-pso@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 Signed-off-by: Paramjit Oberoi --- 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 += zone_sz; + mem_sz -= zone_sz; prz_ar[i]->type = pstore_name_to_type(name); } *przs = prz_ar; + *paddr += mem_sz; return 0; fail: