From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9929CC47247 for ; Sat, 9 May 2020 11:15:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DDB6214D8 for ; Sat, 9 May 2020 11:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728487AbgEILPS (ORCPT ); Sat, 9 May 2020 07:15:18 -0400 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:56786 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728295AbgEILO6 (ORCPT ); Sat, 9 May 2020 07:14:58 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07439087|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.0208241-0.000181819-0.978994;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03293;MF=liaoweixiong@allwinnertech.com;NM=1;PH=DS;RN=20;RT=20;SR=0;TI=SMTPD_---.HVopGr-_1589022874; Received: from PC-liaoweixiong.allwinnertech.com(mailfrom:liaoweixiong@allwinnertech.com fp:SMTPD_---.HVopGr-_1589022874) by smtp.aliyun-inc.com(10.147.44.129); Sat, 09 May 2020 19:14:50 +0800 From: WeiXiong Liao To: Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Jonathan Corbet , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Greg Kroah-Hartman , Pavel Tatashin Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, WeiXiong Liao Subject: [PATCH v5 10/12] pstore/blk: Provide way to query pstore configuration Date: Sat, 9 May 2020 19:14:12 +0800 Message-Id: <1589022854-19821-11-git-send-email-liaoweixiong@allwinnertech.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1589022854-19821-1-git-send-email-liaoweixiong@allwinnertech.com> References: <1589022854-19821-1-git-send-email-liaoweixiong@allwinnertech.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to configure itself, the MTD backend needs to be able to query the current pstore configuration. Introduce pstore_blk_usr_info() for this purpose. Signed-off-by: WeiXiong Liao Link: https://lore.kernel.org/r/1585126506-18635-10-git-send-email-liaoweixiong@allwinnertech.com Signed-off-by: Kees Cook --- fs/pstore/blk.c | 37 ++++++++++++++++++++++++++++++------- include/linux/pstore_blk.h | 10 ++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c index bf27dbd18db2..a6d578f9df2a 100644 --- a/fs/pstore/blk.c +++ b/fs/pstore/blk.c @@ -86,6 +86,17 @@ sector_t start_sect; } g_bdev_info; +#define check_size(name, alignsize) ({ \ + long _##name_ = (name); \ + _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \ + if (_##name_ & ((alignsize) - 1)) { \ + pr_info(#name " must align to %d\n", \ + (alignsize)); \ + _##name_ = ALIGN(name, (alignsize)); \ + } \ + _##name_; \ +}) + /** * struct psblk_device - back-end pstore/blk driver structure. * @@ -140,13 +151,11 @@ static int psblk_register_do(struct psblk_device *dev) if (!dev->flags) dev->flags = UINT_MAX; #define verify_size(name, alignsize, enable) { \ - long _##name_ = (enable) ? (name) : 0; \ - _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \ - if (_##name_ & ((alignsize) - 1)) { \ - pr_info(#name " must align to %d\n", \ - (alignsize)); \ - _##name_ = ALIGN(name, (alignsize)); \ - } \ + long _##name_; \ + if (enable) \ + _##name_ = check_size(name, alignsize); \ + else \ + _##name_ = 0; \ name = _##name_ / 1024; \ pstore_zone_info->name = _##name_; \ } @@ -465,6 +474,20 @@ int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect) } EXPORT_SYMBOL_GPL(psblk_blkdev_info); +/* get information of pstore/blk */ +int pstore_blk_usr_info(struct pstore_blk_info *info) +{ + strncpy(info->device, blkdev, 80); + info->max_reason = max_reason; + info->kmsg_size = check_size(kmsg_size, 4096); + info->pmsg_size = check_size(pmsg_size, 4096); + info->ftrace_size = check_size(ftrace_size, 4096); + info->console_size = check_size(console_size, 4096); + + return 0; +} +EXPORT_SYMBOL_GPL(pstore_blk_usr_info); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("WeiXiong Liao "); MODULE_DESCRIPTION("pstore backend for block devices"); diff --git a/include/linux/pstore_blk.h b/include/linux/pstore_blk.h index 828b0763d477..dd5213044e21 100644 --- a/include/linux/pstore_blk.h +++ b/include/linux/pstore_blk.h @@ -27,4 +27,14 @@ int psblk_register_blkdev(unsigned int major, unsigned int flags, void psblk_unregister_blkdev(unsigned int major); int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect); +struct pstore_blk_info { + char device[80]; + enum kmsg_dump_reason max_reason; + unsigned long kmsg_size; + unsigned long pmsg_size; + unsigned long console_size; + unsigned long ftrace_size; +}; +int pstore_blk_usr_info(struct pstore_blk_info *info); + #endif -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C0DCC28CBC for ; Sat, 9 May 2020 11:18:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 44904214D8 for ; Sat, 9 May 2020 11:18:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="f3Q6Cp8/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44904214D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=allwinnertech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=MR0uoNjb3LeYJvmyOKBSC6wDKmpaELvNRBLQr2sBL80=; b=f3Q6Cp8/rv+VcpPpcgJ34m+eDV sv73IqO0/YM1fu2A6OP4HiOwI63iSKTfXrq4aS8oc0a7mm0n51RU+QmZbzYiJ+D9aVlmozxWJXJNc kGdcClLgdCCT5SeSn8B+2yY4ZM80yALTmRcXNQ0jqlUs6T+7uykJ0Y5jQmOPRoaSkuJTDO3k+mm5i sUFMJo+pRsXGcvhmCYD2EEe715XWJI+0PhtO7j0cqTaOu95mmrwuHAqg2peNAvbhUOxHVuCHrgdbB 3AQTxen/pRI26l6Myv2Q5y/W5WZLH1Pavbs8ibITeHawGJaJb+LBiirYiELZ0nItvtvJXL5ri2MlD Lmx+GCLw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXNUP-0002Lb-Kt; Sat, 09 May 2020 11:17:53 +0000 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXNRX-0005mz-1s for linux-mtd@lists.infradead.org; Sat, 09 May 2020 11:14:57 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07439087|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.0208241-0.000181819-0.978994; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03293; MF=liaoweixiong@allwinnertech.com; NM=1; PH=DS; RN=20; RT=20; SR=0; TI=SMTPD_---.HVopGr-_1589022874; Received: from PC-liaoweixiong.allwinnertech.com(mailfrom:liaoweixiong@allwinnertech.com fp:SMTPD_---.HVopGr-_1589022874) by smtp.aliyun-inc.com(10.147.44.129); Sat, 09 May 2020 19:14:50 +0800 From: WeiXiong Liao To: Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Jonathan Corbet , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Greg Kroah-Hartman , Pavel Tatashin Subject: [PATCH v5 10/12] pstore/blk: Provide way to query pstore configuration Date: Sat, 9 May 2020 19:14:12 +0800 Message-Id: <1589022854-19821-11-git-send-email-liaoweixiong@allwinnertech.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1589022854-19821-1-git-send-email-liaoweixiong@allwinnertech.com> References: <1589022854-19821-1-git-send-email-liaoweixiong@allwinnertech.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200509_041455_283033_040FD122 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: WeiXiong Liao , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org In order to configure itself, the MTD backend needs to be able to query the current pstore configuration. Introduce pstore_blk_usr_info() for this purpose. Signed-off-by: WeiXiong Liao Link: https://lore.kernel.org/r/1585126506-18635-10-git-send-email-liaoweixiong@allwinnertech.com Signed-off-by: Kees Cook --- fs/pstore/blk.c | 37 ++++++++++++++++++++++++++++++------- include/linux/pstore_blk.h | 10 ++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c index bf27dbd18db2..a6d578f9df2a 100644 --- a/fs/pstore/blk.c +++ b/fs/pstore/blk.c @@ -86,6 +86,17 @@ sector_t start_sect; } g_bdev_info; +#define check_size(name, alignsize) ({ \ + long _##name_ = (name); \ + _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \ + if (_##name_ & ((alignsize) - 1)) { \ + pr_info(#name " must align to %d\n", \ + (alignsize)); \ + _##name_ = ALIGN(name, (alignsize)); \ + } \ + _##name_; \ +}) + /** * struct psblk_device - back-end pstore/blk driver structure. * @@ -140,13 +151,11 @@ static int psblk_register_do(struct psblk_device *dev) if (!dev->flags) dev->flags = UINT_MAX; #define verify_size(name, alignsize, enable) { \ - long _##name_ = (enable) ? (name) : 0; \ - _##name_ = _##name_ <= 0 ? 0 : (_##name_ * 1024); \ - if (_##name_ & ((alignsize) - 1)) { \ - pr_info(#name " must align to %d\n", \ - (alignsize)); \ - _##name_ = ALIGN(name, (alignsize)); \ - } \ + long _##name_; \ + if (enable) \ + _##name_ = check_size(name, alignsize); \ + else \ + _##name_ = 0; \ name = _##name_ / 1024; \ pstore_zone_info->name = _##name_; \ } @@ -465,6 +474,20 @@ int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect) } EXPORT_SYMBOL_GPL(psblk_blkdev_info); +/* get information of pstore/blk */ +int pstore_blk_usr_info(struct pstore_blk_info *info) +{ + strncpy(info->device, blkdev, 80); + info->max_reason = max_reason; + info->kmsg_size = check_size(kmsg_size, 4096); + info->pmsg_size = check_size(pmsg_size, 4096); + info->ftrace_size = check_size(ftrace_size, 4096); + info->console_size = check_size(console_size, 4096); + + return 0; +} +EXPORT_SYMBOL_GPL(pstore_blk_usr_info); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("WeiXiong Liao "); MODULE_DESCRIPTION("pstore backend for block devices"); diff --git a/include/linux/pstore_blk.h b/include/linux/pstore_blk.h index 828b0763d477..dd5213044e21 100644 --- a/include/linux/pstore_blk.h +++ b/include/linux/pstore_blk.h @@ -27,4 +27,14 @@ int psblk_register_blkdev(unsigned int major, unsigned int flags, void psblk_unregister_blkdev(unsigned int major); int psblk_blkdev_info(dev_t *devt, sector_t *nr_sects, sector_t *start_sect); +struct pstore_blk_info { + char device[80]; + enum kmsg_dump_reason max_reason; + unsigned long kmsg_size; + unsigned long pmsg_size; + unsigned long console_size; + unsigned long ftrace_size; +}; +int pstore_blk_usr_info(struct pstore_blk_info *info); + #endif -- 1.9.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/