From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD6FA35CBA9 for ; Sun, 16 Nov 2025 10:28:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763288937; cv=none; b=WBohrxQ2tMLPYcAJP1RNDmsennfX1reNu+fM+PKZkh9QYW4ejV7rm0ZdEQNKGkVbXqQ+VUnw1S/TtQW/1Td47AlqbXymqVdrVV8vHFQcvmyA1JTWY9DU+cQ+vsuX+qk4llYodUlgv4cjTEDfvxP1chblAeMiWTZ2H+wzYzwbUyc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763288937; c=relaxed/simple; bh=6f1VXJgPcTe2fjyzE9KBLwf9UmHUXkRuwQmfUQF2VpA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=m7kfeEMxqDroOTmu4O2ssgDVxfeQSBNj8szlgrcNt+y6iPeGSrxYLFIsCEBQtPzJnbD975Ffz+q1LxugQGVyq/p+2VBqRKoPru2lhAqvcfJ4+s10QpYMGvf1P2lJCv0asheDcsryzEJ08d0fQLF05i1HmAsRtOvNLglorEWfuK4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gms.tku.edu.tw; spf=pass smtp.mailfrom=gms.tku.edu.tw; dkim=pass (2048-bit key) header.d=gms-tku-edu-tw.20230601.gappssmtp.com header.i=@gms-tku-edu-tw.20230601.gappssmtp.com header.b=diGzonbL; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gms.tku.edu.tw Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gms.tku.edu.tw Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gms-tku-edu-tw.20230601.gappssmtp.com header.i=@gms-tku-edu-tw.20230601.gappssmtp.com header.b="diGzonbL" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-295548467c7so39475385ad.2 for ; Sun, 16 Nov 2025 02:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gms-tku-edu-tw.20230601.gappssmtp.com; s=20230601; t=1763288934; x=1763893734; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=JSW7JgNcs7DWh1nW7rtjeN1ASDGAXAC868BibcndNtw=; b=diGzonbLldtgCia/IgRQUEFlniO7cVfe9Xb/6gboGJfTmwKLTtfrCxGPnkBbqzFTuB CSbn5j2EnzzYYBcv8Y4a+5u1DXZy0kW2UDG96wlykweOjZSpeauvNJHBdz/DK+VFKcb8 N0kp/KBE44/jk4H4xTHx7erdKFcEpxZ1KyFXM73kTVvVw73O4vNm58C3hhxRLg0xIa3Z TUbJwB/DT/zpQai5Aes4PcGkn6vw4HfA4jgkRiD5jS5UP2hxacC6me289rHjl2JzjNsP EfS7VEiClvbuzvQi2gOopDSw+bXGqrSPSonCbwH+APzR5GP9umXIDb1od2E23WvchhgI Cm9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763288934; x=1763893734; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JSW7JgNcs7DWh1nW7rtjeN1ASDGAXAC868BibcndNtw=; b=jjTwuxryMwQ/NEmiLSEmdVrV4i3qgMP3Gye0g2ff9OtLDxAg2VqdNtKUxnKLhJ1rOs E7chHBUcsBatFPsJAZtqq2pgdUjpafKiqIav1qUu4nRV+Du6+lG+10pQN3dNhAn1bg3h lU51T9IMj24FC/dV359npLsZTANK0/WWwpo7v7OsVhyFd7c66Pdo02fVRw9a7zPTnyrq EU498sFPds1XDOpaQ5FNTQ0tjfFdCSl2toCbl8yJAI0irazz/PB81q7/bcWV8AOghj4E E8Z4IpuICmZQdefUx/D7CMfBgAnsPwCNKrDFdqpeDWGp/LHQ3D8mI03I2IfncEfMu4M8 thpA== X-Forwarded-Encrypted: i=1; AJvYcCV+ZxJOQtg/7MeR/EIfXbCmgsIXgxySlkpo22HoaSNzwqk3uy6cFZ+xilwRyRJkkOpgOMuunIQzoPl51wc=@vger.kernel.org X-Gm-Message-State: AOJu0YwCot7XhTjEB0czjTXlvObhtxnJXfvo2puyha8Dle22InZ87tQj hG6WP/S7Y7vQO7MVlsqMhKzNuvoQcSALtSFDADwk2ulPJHUeODflX13IUUAPudGSfhs= X-Gm-Gg: ASbGncvaT3bMe5IezLHFbIWQMlAITQ+0jWtONyWt8kwKI2A+N2vUYAN+xICHu5XVI2P P9p+IZiRmM/+RbYvzDksRk4nCBxzwZgmu6sFo5M4ADM8mGBmfvazB7Lz180TiVqxvc1CkNxiHKo ZeWDkINGujJQPxa1M1jYwpngz8AV4/wxkU0ZVfSui0oOvyWkHhrnovPn5SjPQbKLJsua5e9Ts0z 8Nju0WQof85/GLI2x4zmdAVWEYE8q7QNWaPqxgrbBviTk2x5Iee/Q0bMA74c9P90jGFDLw53rpZ DPJQgjG8r22MPI53gbnxntYyfjw0zkof0E2Hfssmb1+8oxn0tXMtS6o8ylorefUsCc8d4RflSRd 3ZkCYZDKryQLWrfnVF6eYXnJIlno/urwZJPf20y+QU7ti6W/QLdF/7cQSuoMb1A2YGW7Z5mMG00 R+u+um13R4cizmiGs+j70qni93E58jb0K3 X-Google-Smtp-Source: AGHT+IHFG6QmWK1KpFn85ysEfm+psI5j9KN7/n/1T01x4vQCppnzXtL7aRATTWAaGCFS+DPVbWd8+Q== X-Received: by 2002:a17:903:1211:b0:28d:18d3:46cb with SMTP id d9443c01a7336-2986a6bf9a7mr103443295ad.20.1763288934185; Sun, 16 Nov 2025 02:28:54 -0800 (PST) Received: from wu-Pro-E500-G6-WS720T ([2001:288:7001:2703:22b3:6dbf:5b14:3737]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2c0fe8sm106790585ad.80.2025.11.16.02.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Nov 2025 02:28:53 -0800 (PST) Date: Sun, 16 Nov 2025 18:28:49 +0800 From: Guan-Chun Wu <409411716@gms.tku.edu.tw> To: David Laight Cc: akpm@linux-foundation.org, andriy.shevchenko@intel.com, axboe@kernel.dk, ceph-devel@vger.kernel.org, ebiggers@kernel.org, hch@lst.de, home7438072@gmail.com, idryomov@gmail.com, jaegeuk@kernel.org, kbusch@kernel.org, linux-fscrypt@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@grimberg.me, tytso@mit.edu, visitorckw@gmail.com, xiubli@redhat.com Subject: Re: [PATCH v5 3/6] lib/base64: rework encode/decode for speed and stricter validation Message-ID: References: <20251114055829.87814-1-409411716@gms.tku.edu.tw> <20251114060132.89279-1-409411716@gms.tku.edu.tw> <20251114091830.5325eed3@pumpkin> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20251114091830.5325eed3@pumpkin> On Fri, Nov 14, 2025 at 09:18:30AM +0000, David Laight wrote: > On Fri, 14 Nov 2025 14:01:32 +0800 > Guan-Chun Wu <409411716@gms.tku.edu.tw> wrote: > > > The old base64 implementation relied on a bit-accumulator loop, which was > > slow for larger inputs and too permissive in validation. It would accept > > extra '=', missing '=', or even '=' appearing in the middle of the input, > > allowing malformed strings to pass. This patch reworks the internals to > > improve performance and enforce stricter validation. > > > > Changes: > > - Encoder: > > * Process input in 3-byte blocks, mapping 24 bits into four 6-bit > > symbols, avoiding bit-by-bit shifting and reducing loop iterations. > > * Handle the final 1-2 leftover bytes explicitly and emit '=' only when > > requested. > > - Decoder: > > * Based on the reverse lookup tables from the previous patch, decode > > input in 4-character groups. > > * Each group is looked up directly, converted into numeric values, and > > combined into 3 output bytes. > > * Explicitly handle padded and unpadded forms: > > - With padding: input length must be a multiple of 4, and '=' is > > allowed only in the last two positions. Reject stray or early '='. > > - Without padding: validate tail lengths (2 or 3 chars) and require > > unused low bits to be zero. > > * Removed the bit-accumulator style loop to reduce loop iterations. > > > > Performance (x86_64, Intel Core i7-10700 @ 2.90GHz, avg over 1000 runs, > > KUnit): > > > > Encode: > > 64B ~90ns -> ~32ns (~2.8x) > > 1KB ~1332ns -> ~510ns (~2.6x) > > > > Decode: > > 64B ~1530ns -> ~35ns (~43.7x) > > 1KB ~27726ns -> ~530ns (~52.3x) > > > > Co-developed-by: Kuan-Wei Chiu > > Signed-off-by: Kuan-Wei Chiu > > Co-developed-by: Yu-Sheng Huang > > Signed-off-by: Yu-Sheng Huang > > Signed-off-by: Guan-Chun Wu <409411716@gms.tku.edu.tw> > > Reviewed-by: David Laight > > But see minor nit below. Hi David, Thanks for the review and for pointing this out. Andrew, would it be possible for you to fold this small change (removing the redundant casts) directly when updating the patch? If that’s not convenient, I can resend an updated version of the series instead. Best regards, Guan-Chun > > --- > > lib/base64.c | 109 ++++++++++++++++++++++++++++++++------------------- > > 1 file changed, 68 insertions(+), 41 deletions(-) > > > > diff --git a/lib/base64.c b/lib/base64.c > > index 9d1074bb821c..1a6d8fe37eda 100644 > > --- a/lib/base64.c > > +++ b/lib/base64.c > > @@ -79,28 +79,38 @@ static const s8 base64_rev_maps[][256] = { > > int base64_encode(const u8 *src, int srclen, char *dst, bool padding, enum base64_variant variant) > > { > > u32 ac = 0; > > - int bits = 0; > > - int i; > > char *cp = dst; > > const char *base64_table = base64_tables[variant]; > > > > - for (i = 0; i < srclen; i++) { > > - ac = (ac << 8) | src[i]; > > - bits += 8; > > - do { > > - bits -= 6; > > - *cp++ = base64_table[(ac >> bits) & 0x3f]; > > - } while (bits >= 6); > > - } > > - if (bits) { > > - *cp++ = base64_table[(ac << (6 - bits)) & 0x3f]; > > - bits -= 6; > > + while (srclen >= 3) { > > + ac = (u32)src[0] << 16 | (u32)src[1] << 8 | (u32)src[2]; > > There is no need for the (u32) casts. > All char/short values are promoted to 'int' prior to any maths. > > > + *cp++ = base64_table[ac >> 18]; > > + *cp++ = base64_table[(ac >> 12) & 0x3f]; > > + *cp++ = base64_table[(ac >> 6) & 0x3f]; > > + *cp++ = base64_table[ac & 0x3f]; > > + > > + src += 3; > > + srclen -= 3; > > } > > - if (padding) { > > - while (bits < 0) { > > + > > + switch (srclen) { > > + case 2: > > + ac = (u32)src[0] << 16 | (u32)src[1] << 8; > > + *cp++ = base64_table[ac >> 18]; > > + *cp++ = base64_table[(ac >> 12) & 0x3f]; > > + *cp++ = base64_table[(ac >> 6) & 0x3f]; > > + if (padding) > > + *cp++ = '='; > > + break; > > + case 1: > > + ac = (u32)src[0] << 16; > > + *cp++ = base64_table[ac >> 18]; > > + *cp++ = base64_table[(ac >> 12) & 0x3f]; > > + if (padding) { > > + *cp++ = '='; > > *cp++ = '='; > > - bits += 2; > > } > > + break; > > } > > return cp - dst; > > } > > @@ -116,41 +126,58 @@ EXPORT_SYMBOL_GPL(base64_encode); > > * > > * Decodes a string using the selected Base64 variant. > > * > > - * This implementation hasn't been optimized for performance. > > - * > > * Return: the length of the resulting decoded binary data in bytes, > > * or -1 if the string isn't a valid Base64 string. > > */ > > int base64_decode(const char *src, int srclen, u8 *dst, bool padding, enum base64_variant variant) > > { > > - u32 ac = 0; > > - int bits = 0; > > - int i; > > u8 *bp = dst; > > - s8 ch; > > + s8 input[4]; > > + s32 val; > > + const u8 *s = (const u8 *)src; > > + const s8 *base64_rev_tables = base64_rev_maps[variant]; > > > > - for (i = 0; i < srclen; i++) { > > - if (padding) { > > - if (src[i] == '=') { > > - ac = (ac << 6); > > - bits += 6; > > - if (bits >= 8) > > - bits -= 8; > > - continue; > > - } > > - } > > - ch = base64_rev_maps[variant][(u8)src[i]]; > > - if (ch == -1) > > - return -1; > > - ac = (ac << 6) | ch; > > - bits += 6; > > - if (bits >= 8) { > > - bits -= 8; > > - *bp++ = (u8)(ac >> bits); > > + while (srclen >= 4) { > > + input[0] = base64_rev_tables[s[0]]; > > + input[1] = base64_rev_tables[s[1]]; > > + input[2] = base64_rev_tables[s[2]]; > > + input[3] = base64_rev_tables[s[3]]; > > + > > + val = input[0] << 18 | input[1] << 12 | input[2] << 6 | input[3]; > > + > > + if (unlikely(val < 0)) { > > + if (!padding || srclen != 4 || s[3] != '=') > > + return -1; > > + padding = 0; > > + srclen = s[2] == '=' ? 2 : 3; > > + break; > > } > > + > > + *bp++ = val >> 16; > > + *bp++ = val >> 8; > > + *bp++ = val; > > + > > + s += 4; > > + srclen -= 4; > > } > > - if (ac & ((1 << bits) - 1)) > > + > > + if (likely(!srclen)) > > + return bp - dst; > > + if (padding || srclen == 1) > > return -1; > > + > > + val = (base64_rev_tables[s[0]] << 12) | (base64_rev_tables[s[1]] << 6); > > + *bp++ = val >> 10; > > + > > + if (srclen == 2) { > > + if (val & 0x800003ff) > > + return -1; > > + } else { > > + val |= base64_rev_tables[s[2]]; > > + if (val & 0x80000003) > > + return -1; > > + *bp++ = val >> 2; > > + } > > return bp - dst; > > } > > EXPORT_SYMBOL_GPL(base64_decode); >