From patchwork Tue Oct 1 16:49:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Massimiliano Pellizzer X-Patchwork-Id: 1991642 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 4XJ3pB65Dsz1xtg for ; Wed, 2 Oct 2024 02:50:10 +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 1svg4Y-00042Y-Sr; Tue, 01 Oct 2024 16:50:02 +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 1svg4W-000415-Kw for kernel-team@lists.ubuntu.com; Tue, 01 Oct 2024 16:50:00 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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 6C0043F140 for ; Tue, 1 Oct 2024 16:50:00 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cb89fbb8cso33004095e9.0 for ; Tue, 01 Oct 2024 09:50:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727801400; x=1728406200; 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=jfaXmJBOEGeYgg+r2gVZ3ylzYLUp1mxAQDs/X7+jPj0=; b=Br0m5bpqwGkJ5r59uMHMwn+YUuTas/8+QQ/riX7U9OgbRpuOZYIl4snyR+c5KNpTXz /7+bMExMc0DgP6VJieBBGCSFhDoF/aGYVVL5zeev2buHtwcBJeNZnetlsqF2gRwl9f1f D6LvBXBfRQFkx2E/5v/PLwDQ2nO4sJwm1Rfe79m2p/og2b5KmAe/15ZQGSqA+yEANMTv D8epq2Q35rD/mvve/H0iloEV2QAV7Nq8kxA3bZQSaXP6FH/YgddJNfcFyldgbgRPVrwm u1kWw8fQO6EsZgzkUaiI7uMPlfTWsKFNrJ10UpTxwI6YpsJbR2IZWOpoXyy6LZjV+Pvu x54Q== X-Gm-Message-State: AOJu0YyrBlSK97pSNGCNn4DYNwFVjRrNLaB6RzuNUXH+WBz5w3bVZWjS VO/h9cRSlNvZjhYjXC2KsIorpcUxzP042bT4vkhFeKhdefudPT1Vn1T0x0Yq4zCO2fQxdKMv5lw tt7C2C9UeTgKaII2cXmcPX2NRJYB4GmwQ2nJCDEwyqlGw08fYk8upQ3zEqfX8PEjOq68mGuyCYu tPSm8+URZebg== X-Received: by 2002:a05:6000:e4e:b0:37c:c9b5:5573 with SMTP id ffacd0b85a97d-37cfb8b57d6mr140450f8f.17.1727801399533; Tue, 01 Oct 2024 09:49:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGGCl8renX8JXRoJ3MHFfFKqTqNgNKA+itaifSHRzM1JZC7JIzb224hENPf9gEnVSoiFRgqQ== X-Received: by 2002:a05:6000:e4e:b0:37c:c9b5:5573 with SMTP id ffacd0b85a97d-37cfb8b57d6mr140427f8f.17.1727801398970; Tue, 01 Oct 2024 09:49:58 -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.49.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:49:58 -0700 (PDT) From: Massimiliano Pellizzer To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/2] f2fs: support printk_ratelimited() in f2fs_printk() Date: Tue, 1 Oct 2024 18:49:48 +0200 Message-ID: <20241001164952.58114-2-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/dir.c | 5 ++--- fs/f2fs/f2fs.h | 38 ++++++++++++++++++++++---------------- fs/f2fs/super.c | 11 ++++++++--- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 99c4a868d73b..c27cc27796fa 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -908,9 +908,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 b6a2324b2704..f9e647698bf4 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1378,10 +1378,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", \ f2fs_fault_name[type], \ __func__, __builtin_return_address(0)) static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) @@ -1844,20 +1864,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 f309e1e4fcd3..a21042bd3764 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -216,7 +216,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; @@ -227,8 +228,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); }