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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55BC2C2BD09 for ; Sun, 23 Jun 2024 02:26:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 073D06B026F; Sat, 22 Jun 2024 22:26:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F17836B02C5; Sat, 22 Jun 2024 22:26:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDE6C6B04FF; Sat, 22 Jun 2024 22:26:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BC9EF6B03B9 for ; Sat, 22 Jun 2024 22:26:52 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 16E54120265 for ; Sun, 23 Jun 2024 02:26:52 +0000 (UTC) X-FDA: 82260565464.19.2CFA345 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by imf30.hostedemail.com (Postfix) with ESMTP id 49BA280008 for ; Sun, 23 Jun 2024 02:26:50 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fcp+CBc+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.219.41 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719109596; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=K+LPiISOoLYsJFxCwMt3f7g5PbGNmTkGzNcNw2ao++w=; b=eqEJPbvlJ8sVAtfEllXWlAL751NV/N7er9+qZbQs0mu6HxUMTTZ2P3lJhkcchFW3t68MCf 7cryPLfnciU7We1PJtudNerf47Xraxah3DoYX+SusrbSfI1b3V0gsYVWHW8kQalF4xLb62 TZ3pv8cDhJLfyCCvu2XHKky3eBdkCuA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719109596; a=rsa-sha256; cv=none; b=oH3uIyX4ee60Jgq+p4P13+KK6AKgii9K0P/ZH6c81K0vR5AbItdt9DPC7aUD04BA15Wovw PZKPmmqK2ntkbyfWrix2vZGRvvXiPp+N5HkTdeVpxwaHa3LORLyOqfuCffh6iRUNWLqTRT cPKzUw8BWGWGTMEgEsyX4PFpnMc/+t0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fcp+CBc+; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.219.41 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6aedd5167d1so13950776d6.1 for ; Sat, 22 Jun 2024 19:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719109609; x=1719714409; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=K+LPiISOoLYsJFxCwMt3f7g5PbGNmTkGzNcNw2ao++w=; b=fcp+CBc+WUKP1pTRuAtud2IN4eSQlHEGrWDZP83cc0NJbwQ4gF14/DkMKrZ/XTqeV/ Ma7bUw38jfmsWy0mo7TjxHOGFHpQGy9rr3gxVJkqbYnm13nbSMnSOmiFvdTBWBG4s6yz Nmhg4Me38rl5jE87I1IleGFy2/8/Ca/ZbKqSd/IPk3bLRfxJX2Qe8BIyrg6ZCAmWtymR Yo29E23M6KmjEfs/M+fRMjC7+dLoO4nEx8F6CZtsqqHvvg81HTksY15a3kHvkGoFE2k0 OYrUUIVuitNLiwqhLXP6Lu54Yw3OWSvippyBLGltOfR+8PpkuJ/V5ZjEGdwSf9QAIpp6 kohA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719109609; x=1719714409; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K+LPiISOoLYsJFxCwMt3f7g5PbGNmTkGzNcNw2ao++w=; b=JLOZNVd9cc3zQvo/JqLt8ZJQEFyKMq1nhgbCLPya2N3rL3JZR/YWZm7TezdBCo6ktY nKZYgdImHWYnp1wypxmifMVH3ZuPt/kMw9159q02aUBldxsKJGxKGdQcx5dFk36yNmlN q5ppnvT8uzKon1eMmoMXeg7HyeFj1OSS2h3qEYXcwjNW8zv4+pSMMtD8jRl5hNo/hHZT Q3c8IJb1j0eDUZ0W+wEpbTaM5FsE0C8CBYxC+XtKqE5r6RCL3z/X2tlBTG3o98fhCrI8 Tz0w08mzbmbsbiK/dqfm2ZbJp1R4QRGsIiMs2564SCr7kouRzezrtXa9G5mY1dpSGF/w dgFQ== X-Forwarded-Encrypted: i=1; AJvYcCUmUtW3VXFjehj14wzVfLIErL2ZB+CLZw89/zm8ejXeiLPeVfqYnabi9k3Trxv8dgs2AxhhaSNBHCQdqVTkjeVh9SM= X-Gm-Message-State: AOJu0Yy10ElmQF0ofFohR5jMBkpx2Sth/rULMfUUGVpBCrB9npCmDPww +GOzcW5kzEB8dqFsAAiEpE0FdxgV3cCTrbInJYOo4g06VPMo2VFGMwxpRybBxFywhel3Y6fvhZx eyDPfrM74TzNCBaXQjnv4Y4+UExs= X-Google-Smtp-Source: AGHT+IFY0Y/UcJS7sknileL2UagN7ReFxrAWEEHMeCw0v9alkFUCpuvgoM4QBmWhVR/dsnO/cQfpgT+sNC6/yK6yero= X-Received: by 2002:a05:6214:20e2:b0:6b5:24b:f430 with SMTP id 6a1803df08f44-6b540a91d2emr16144186d6.40.1719109609327; Sat, 22 Jun 2024 19:26:49 -0700 (PDT) MIME-Version: 1.0 References: <20240621022959.9124-1-laoar.shao@gmail.com> <20240621022959.9124-7-laoar.shao@gmail.com> <20240621135142.GF1098275@kernel.org> In-Reply-To: <20240621135142.GF1098275@kernel.org> From: Yafang Shao Date: Sun, 23 Jun 2024 10:26:13 +0800 Message-ID: Subject: Re: [PATCH v3 06/11] mm/util: Deduplicate code in {kstrdup,kstrndup,kmemdup_nul} To: Simon Horman Cc: torvalds@linux-foundation.org, ebiederm@xmission.com, alexei.starovoitov@gmail.com, rostedt@goodmis.org, catalin.marinas@arm.com, akpm@linux-foundation.org, penguin-kernel@i-love.sakura.ne.jp, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, audit@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 49BA280008 X-Stat-Signature: miq77fbnet7na994jxc5rojj8cgmjaj8 X-Rspam-User: X-HE-Tag: 1719109610-806274 X-HE-Meta: U2FsdGVkX1/O0bqAirhZfwC2CwfIVj7tukZNUwl/tUseUC/2UsgMxdlZWzPrnbWyS12wUfRWaOVdwWv5kgA8S0vey0RkPTVmhLAJF1XZbvq8eNVhLJCF6/92MGfvUEhd4kiuP8syVnp2jkXlEogBPhWK7qBXM/6W3bEF0rZAazb2VSSXUty7U0tS92zKRX2hdc8wWYmCvMp3bgrE7rk3FYc3y1Q9mfrV5yqiBng5CX4D2wowKqkSEAleRtGRqPj4EZpXUGIug8QxJHCx6QzIW8N1SQR4mnvDnx8a9Q7z1NLapqtRwijYRdYbv0R2tOJ8/ZFMpDDbvw6gAckdm+7IjO4GGoP46QKf+95YZeubNbJYw31bBI5/LYK5FVmVjK6mOTiaZTkHNWDenJ+JgwfhtpjFMVaymYzNaDn5/2MrvJCx+hIrKO2bbhI4ZmR8nQok5p/GTgSq8g5ypNLWy3rumOmLzv0I3COHOJAkU+uTyJxABI/1zQKoNm6lPTEt2jKx9plezjFDe+ABZU0tc4W2IDzsfFM+snf2BIZL7ByF6C1oGdtrfYExWhZO102Hl9fMnTyQIE8wjBRM2Do4TJfPwKgbfJ1h0YTiYLv1E9d/sKilxAthfr3jrOO1vpaK8F4CtODIOM+AZuxcQetNf8HOIf7gjZjnhM2g1ssZIywt+8Cww3zDKmMsTzKQ6Neht9AGK+I2nqEz957sSBIWY8wTjucgimZunKVXGmJEJ/ii5JV1q64eG2+7IXQ03auTNj9VLQGM7iLZv7cToMM0ckVVQMfrErVGtSNUWbVhaME09IJgGIPKLUstJXDRh5R6VCOARffRpjyJ/B6gmX+ER7aC5xcV/DTuFHAGU/p3XxGzleNqMiSI6PepjHxc6h9aovT2R/fg1yeZoejrAXOCAyFyrWSqH+qxJUY7h8kbNJrkyn6HqoOBYRlln8inYdBxHeVfM8SNybY+H/pseRT3CqX ga/cOcn4 4c1+tuvFs1613X+2y/AMKq4ibopHzj5MS90hbsTGfdrqmvNu482XDYSGgh00fjL+F8RqQPfEiwXHp4TaTaeGZmu+EqTEF2Fopvtqn9IIjmDvNB7GSl1G3m9LDLT2kzjrXvkTAxsjVsQv0Vg2OinXSitm7D13R1wGpmpTRcrDjB/f2OemfuvIN1KRfWRL8GDc6rPf4Yv0U/59eB/LICY28tFuGWjusnxRd+ux+aYRmcqwcr0c2pC4Ooj/TsOu3TX8cTie2Qf9nn1Ajuvv36jBOYS3/tvN8AYHu8HnZhuBnpeX9gg0nojsL3yp1RYqc9EvYtQbTNC7O5jLo7Nxm5JXq78H2SC7TNVDhGA8MgCH4+k5CjF7w8P5av7Q9pFZOdbazBcJdMCdzFCOUUkjOB0Jne1sy522C41mN6d35+yF+PBc3yY3/aAOqvBSsllMFxnTKvNB6LSthzNaVWQOQvVPd0UpzGA50Ln3FcxV0wcdx6I37Lh+9yI2BSfxq13n8yebp/66n2lSW3FkvatOOGleBSmSU4gY1hB8LIP6fLFEDFsdOycVH4SB1uF2s9IhCw2AYuZ1jveXSU9Zl4meotqg4otFS/Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Jun 21, 2024 at 9:51=E2=80=AFPM Simon Horman wro= te: > > On Fri, Jun 21, 2024 at 10:29:54AM +0800, Yafang Shao wrote: > > These three functions follow the same pattern. To deduplicate the code, > > let's introduce a common help __kstrndup(). > > > > Suggested-by: Andrew Morton > > Signed-off-by: Yafang Shao > > Hi Yafang Shao, > > Some minor nits from my side. > > > --- > > mm/internal.h | 24 ++++++++++++++++++++++++ > > mm/util.c | 27 ++++----------------------- > > 2 files changed, 28 insertions(+), 23 deletions(-) > > > > diff --git a/mm/internal.h b/mm/internal.h > > index b2c75b12014e..fd87f685739b 100644 > > --- a/mm/internal.h > > +++ b/mm/internal.h > > @@ -1521,4 +1521,28 @@ static inline void shrinker_debugfs_remove(struc= t dentry *debugfs_entry, > > void workingset_update_node(struct xa_node *node); > > extern struct list_lru shadow_nodes; > > > > +/** > > + * __kstrndup - Create a NUL-terminated string from @s, which might be= unterminated. > > + * @s: The data to stringify > > + * @len: The size of the data, including the null terminator > > + * @gfp: the GFP mask used in the kmalloc() call when allocating memor= y > > + * > > + * Return: newly allocated copy of @s with NUL-termination or %NULL in > > + * case of error > > + */ > > +static __always_inline char *__kstrndup(const char *s, size_t len, gfp= _t gfp) > > +{ > > + char *buf; > > + > > + buf =3D kmalloc_track_caller(len, gfp); > > + if (!buf) > > + return NULL; > > + > > + memcpy(buf, s, len); > > + /* Ensure the buf is always NUL-terminated, regardless of @s. */ > > + buf[len - 1] =3D '\0'; > > + return buf; > > +} > > + > > + > > nit: One blank line is enough. Ah, will change it. > > > #endif /* __MM_INTERNAL_H */ > > diff --git a/mm/util.c b/mm/util.c > > index 41c7875572ed..d9135c5fdf7f 100644 > > --- a/mm/util.c > > +++ b/mm/util.c > > @@ -58,17 +58,8 @@ char *kstrdup(const char *s, gfp_t gfp) > > if (!s) > > return NULL; > > > > - len =3D strlen(s) + 1; > > - buf =3D kmalloc_track_caller(len, gfp); > > - if (buf) { > > - memcpy(buf, s, len); > > - /* During memcpy(), the string might be updated to a new = value, > > - * which could be longer than the string when strlen() is > > - * called. Therefore, we need to add a null termimator. > > - */ > > - buf[len - 1] =3D '\0'; > > - } > > - return buf; > > nit: The local variable buf is now unused, and should be removed from kst= rdup(). > Likewise for kstrndup() and kmemdup_nul() > > Flagged by W=3D1 builds with gcc-13 and clang-18, and Smatch. I missed that. Thanks for pointing it out. --=20 Regards Yafang