From patchwork Tue Oct 1 16:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Massimiliano Pellizzer X-Patchwork-Id: 1991644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJ3pD6047z1xtk for ; Wed, 2 Oct 2024 02:50:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1svg4b-00044k-Oz; Tue, 01 Oct 2024 16:50:05 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1svg4Z-00042x-Il for kernel-team@lists.ubuntu.com; Tue, 01 Oct 2024 16:50:03 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 56E283F5E1 for ; Tue, 1 Oct 2024 16:50:03 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42caf073db8so47500755e9.3 for ; Tue, 01 Oct 2024 09:50:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727801402; x=1728406202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rNpG5QdecUzXk6e6RMFTS6ZJSSJUzdkM0t40Y8xe4KY=; b=PsDBXih163lfo3GAqQYenEeeSJpeYzQse5wTuj3GpPRz0Ps7D1NvI3mMyA4D7Xpjdr uh1j6PmxTi0RYkfHyuL1ify+GWvyQ0xjOFAL6YVkKff4mrCjJxLlnJ296lAGFVJ7zAoP m79iMa2GKnQHA2mcvSWoLBM8kEGH9ou3wjVhgqlDy0kMuTFEB+XC4h32mGsHiYonnMl4 w5JlnguG/lnPLX7sXLN+97OgLs3kgdqCr7YKtPCCYmgI7mJRCIvNbkP5uUxzaTVdT/I7 76fNopEELIZXSP09ZDD6OecIxd2s+l3Cdj/FLKJC0jFe69Cy7MvNCHg1H4Q0OTxK9Wxr z2VQ== X-Gm-Message-State: AOJu0YwF1gJNTKWZxzDAScTHML10RCl3pmBuSTYbUszR0zzLs/YAIVcG 6f+TT2JaXpkPSXbVFPf9n6DnIB1f3wE7cntS724/+fOQCR9TxEImWEk4wtEEzBRN8E86La+V/in whuvzGw+mxX4pOWoM5fMVSCIa5yy8+ILS1zHGcPNI9m/iA42BIXh3jVcLkTiDToKlsKPeUEw5ZL E6WTJNYRBqIQ== X-Received: by 2002:a05:600c:1914:b0:42c:bbd5:af60 with SMTP id 5b1f17b1804b1-42f777ee77amr957095e9.24.1727801402226; Tue, 01 Oct 2024 09:50:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6oaRA346uaQMcljSGZAw9hxrfE5nCvJfxF7X0QSEmYujpr5bWvCnKpvnGIsoHL8TI6F0khw== X-Received: by 2002:a05:600c:1914:b0:42c:bbd5:af60 with SMTP id 5b1f17b1804b1-42f777ee77amr956825e9.24.1727801401637; Tue, 01 Oct 2024 09:50:01 -0700 (PDT) Received: from framework-canonical.station (net-93-71-67-9.cust.vodafonedsl.it. [93.71.67.9]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57dec169sm138504195e9.21.2024.10.01.09.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:50:01 -0700 (PDT) From: Massimiliano Pellizzer To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 1/2] f2fs: support printk_ratelimited() in f2fs_printk() Date: Tue, 1 Oct 2024 18:49:50 +0200 Message-ID: <20241001164952.58114-4-massimiliano.pellizzer@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001164952.58114-1-massimiliano.pellizzer@canonical.com> References: <20241001164952.58114-1-massimiliano.pellizzer@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Chao Yu [ Upstream commit b1c9d3f833ba60a288db111d7fe38edfeb9b8fbb ] This patch supports using printk_ratelimited() in f2fs_printk(), and wrap ratelimited f2fs_printk() into f2fs_{err,warn,info}_ratelimited(), then, use these new helps to clean up codes. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Stable-dep-of: aa4074e8fec4 ("f2fs: fix block migration when section is not aligned to pow2") Signed-off-by: Sasha Levin (backported from commit 42d48304f64e17b9cad69a8f93b46ba5603ced76 linux-6.6.y) [mpellizzer: backported solving merge conflicts which do not affect the fix] CVE-2024-44942 Signed-off-by: Massimiliano Pellizzer --- fs/f2fs/compress.c | 10 +++++----- fs/f2fs/dir.c | 5 ++--- fs/f2fs/f2fs.h | 38 ++++++++++++++++++++++---------------- fs/f2fs/super.c | 11 ++++++++--- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index be46dc41523b..9edad4a4d706 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -510,8 +510,8 @@ static int lzorle_compress_pages(struct compress_ctx *cc) ret = lzorle1x_1_compress(cc->rbuf, cc->rlen, cc->cbuf->cdata, &cc->clen, cc->private); if (ret != LZO_E_OK) { - printk_ratelimited("%sF2FS-fs (%s): lzo-rle compress failed, ret:%d\n", - KERN_ERR, F2FS_I_SB(cc->inode)->sb->s_id, ret); + f2fs_err_ratelimited(F2FS_I_SB(cc->inode), + "lzo-rle compress failed, ret:%d", ret); return -EIO; } return 0; @@ -809,9 +809,9 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic) if (provided != calculated) { if (!is_inode_flag_set(dic->inode, FI_COMPRESS_CORRUPT)) { set_inode_flag(dic->inode, FI_COMPRESS_CORRUPT); - printk_ratelimited( - "%sF2FS-fs (%s): checksum invalid, nid = %lu, %x vs %x", - KERN_INFO, sbi->sb->s_id, dic->inode->i_ino, + f2fs_info_ratelimited(sbi, + "checksum invalid, nid = %lu, %x vs %x", + dic->inode->i_ino, provided, calculated); } set_sbi_flag(sbi, SBI_NEED_FSCK); diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 5c78350158df..f358859cb478 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -1017,9 +1017,8 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, de = &d->dentry[bit_pos]; if (de->name_len == 0) { if (found_valid_dirent || !bit_pos) { - printk_ratelimited( - "%sF2FS-fs (%s): invalid namelen(0), ino:%u, run fsck to fix.", - KERN_WARNING, sbi->sb->s_id, + f2fs_warn_ratelimited(sbi, + "invalid namelen(0), ino:%u, run fsck to fix.", le32_to_cpu(de->ino)); set_sbi_flag(sbi, SBI_NEED_FSCK); } diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 5b1571eaaee1..900ae6d4769a 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1808,10 +1808,30 @@ struct f2fs_private_dio { bool write; }; +__printf(3, 4) +void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...); + +#define f2fs_err(sbi, fmt, ...) \ + f2fs_printk(sbi, false, KERN_ERR fmt, ##__VA_ARGS__) +#define f2fs_warn(sbi, fmt, ...) \ + f2fs_printk(sbi, false, KERN_WARNING fmt, ##__VA_ARGS__) +#define f2fs_notice(sbi, fmt, ...) \ + f2fs_printk(sbi, false, KERN_NOTICE fmt, ##__VA_ARGS__) +#define f2fs_info(sbi, fmt, ...) \ + f2fs_printk(sbi, false, KERN_INFO fmt, ##__VA_ARGS__) +#define f2fs_debug(sbi, fmt, ...) \ + f2fs_printk(sbi, false, KERN_DEBUG fmt, ##__VA_ARGS__) + +#define f2fs_err_ratelimited(sbi, fmt, ...) \ + f2fs_printk(sbi, true, KERN_ERR fmt, ##__VA_ARGS__) +#define f2fs_warn_ratelimited(sbi, fmt, ...) \ + f2fs_printk(sbi, true, KERN_WARNING fmt, ##__VA_ARGS__) +#define f2fs_info_ratelimited(sbi, fmt, ...) \ + f2fs_printk(sbi, true, KERN_INFO fmt, ##__VA_ARGS__) + #ifdef CONFIG_F2FS_FAULT_INJECTION #define f2fs_show_injection_info(sbi, type) \ - printk_ratelimited("%sF2FS-fs (%s) : inject %s in %s of %pS\n", \ - KERN_INFO, sbi->sb->s_id, \ + f2fs_info_ratelimited(sbi, "inject %s in %s of %pS\n", \ f2fs_fault_name[type], \ __func__, __builtin_return_address(0)) static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) @@ -2237,20 +2257,6 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, return -ENOSPC; } -__printf(2, 3) -void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...); - -#define f2fs_err(sbi, fmt, ...) \ - f2fs_printk(sbi, KERN_ERR fmt, ##__VA_ARGS__) -#define f2fs_warn(sbi, fmt, ...) \ - f2fs_printk(sbi, KERN_WARNING fmt, ##__VA_ARGS__) -#define f2fs_notice(sbi, fmt, ...) \ - f2fs_printk(sbi, KERN_NOTICE fmt, ##__VA_ARGS__) -#define f2fs_info(sbi, fmt, ...) \ - f2fs_printk(sbi, KERN_INFO fmt, ##__VA_ARGS__) -#define f2fs_debug(sbi, fmt, ...) \ - f2fs_printk(sbi, KERN_DEBUG fmt, ##__VA_ARGS__) - static inline void dec_valid_block_count(struct f2fs_sb_info *sbi, struct inode *inode, block_t count) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 10bc5ee67374..30ea10724195 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -249,7 +249,8 @@ static match_table_t f2fs_tokens = { {Opt_err, NULL}, }; -void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...) +void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, + const char *fmt, ...) { struct va_format vaf; va_list args; @@ -260,8 +261,12 @@ void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...) level = printk_get_level(fmt); vaf.fmt = printk_skip_level(fmt); vaf.va = &args; - printk("%c%cF2FS-fs (%s): %pV\n", - KERN_SOH_ASCII, level, sbi->sb->s_id, &vaf); + if (limit_rate) + printk_ratelimited("%c%cF2FS-fs (%s): %pV\n", + KERN_SOH_ASCII, level, sbi->sb->s_id, &vaf); + else + printk("%c%cF2FS-fs (%s): %pV\n", + KERN_SOH_ASCII, level, sbi->sb->s_id, &vaf); va_end(args); }