From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 3AB593BD63C for ; Thu, 11 Jun 2026 09:54:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781171685; cv=none; b=VDXfymKyGJ+kMshEZOnqgkWLWGArzYA5uJEFpR65qIsNLtpw95opUSMicRST4ATtcAl+1s7p6llMvWoZIyhSjkj47dw4Q65+jzEtTZQveJY7AzWnQZuvaMYqIm5ZOwygsrLVK0p0IqyZS/tOse+3y4kxhP0u1MuS+GefAYDxWSc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781171685; c=relaxed/simple; bh=DTXy+nATs6AtTjATzuGaozkL4ikAWElhk0F/0/Km1RA=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fDPJ5aLK/gcrtfXAAX+coHGZQApzranqOF3J3wAogdAupG1UfxbAV7CxWLsDi+LlifiWEDiHuKQszZtZ36DJhXTF+h3iCyEB7EhPCCx8DxaUUZC5ytzzCC6FLuiPW47EXaF85ud3C0VWqhktI4W5roa4WbDLtXOo2OeNYxa5H+M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q4Qd8qLa; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q4Qd8qLa" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-490cdae130cso28585935e9.0 for ; Thu, 11 Jun 2026 02:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781171682; x=1781776482; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=XZ30VMnl+gW987ZPMF64+Gkq5LiegWTdCluAb920VoA=; b=Q4Qd8qLaFldmx5xX1jaa31d5fMVYsJ/OajVfF0SFX97e7AN8Z3RDzJA1odwlRBYI6x cp1dwrN0ulorY6/7XkLODfscxein2gxA6te9eeAOAVdeQtLtTmL0aDTg9YHp1jGTfuOc gLRfKUFB4ukgQrUPMuv14zXvO35wgwmnWhyJGXxW5U58p0lAED5wM/wCzmqK0JP9ctk7 IrUPsauZuOz/6kbm5zBk6X7fKlspdzY9QbOWNX+yh28imx8YdDULDneM96lfsSvSa7vr oP++QZs6qoTcqgzGspDrqwH8GgfiDao7DF6IRQDYzJDdkbOX6GmpAoWsEbAnzUVDJNK7 a2XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781171682; x=1781776482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XZ30VMnl+gW987ZPMF64+Gkq5LiegWTdCluAb920VoA=; b=U1FE8iusHcYWflpx300rI6wahBg/M1mD144wNKrDQy8UPPfL2lT160uccOLeysFjTn VxvSTn/ZbHjAToFyCx2G9WGizCGzch7cgEX3Y6bWFPiGbAAubngEbbHrW51JX0M5Sz4v 9yIqDMfyGkg4Amj+saFJUeFmVjZYhGzrvGS2YP2GgqnDykj7W6bI/xAf7NJ6K48EM+6+ v7gtLM2MX9C2XMf98NfGj5I/xiefv8TRPmIrxMNulF1dh2iq6pP7jT0mEeQOC6TC3lIS oMggnuTfnddWcHYWczElRF9THvEvHRjsXNg5P/5qFCxLwvI+tJA/QySjNNrnC0zSZwUl MooQ== X-Forwarded-Encrypted: i=1; AFNElJ8yDay6TB/zOdh6YeF+BcG/fTowATXBirK6AbYzH1Fe72SapfTkh4lnkvpaHm0EVj/tbb8/K/5ItEBMRio=@vger.kernel.org X-Gm-Message-State: AOJu0YyEP5QdQaAvatFhg6xDGcTXBbjh0B4Rr5vOAbyRWVZt5oKz2uC0 ov3+A5Hu36oey7KdmKNrX64wno0JJFaTRbIMRz3U6gxVcjL7ZRwc9sYnWz2v7gh+ X-Gm-Gg: Acq92OGYngS/DzHLLMy6aK5DHwTyYVLG4GfVh2AoesaWnMv0SZN0aY0xiRd8vWC7RGt q0qCtBbNldl6qOo3pdnZRN2zP58gGRndoTcypWiztB+u3it/+uYN730zwpQFWqpMJSVcYa8Y/N2 UZt3hQgn3VuzAY3fv+ogv1X7iVi2eYVuy3RUHUfsOKjwFl2M5g8r9rR0DoMB+TEtoyOWDOATLOi PcrSNFt576GWy/aBc6CcJuST4opIqEztqepkAovXQ38TPKVXdRZD6Etbmk/+JxTequ3HfrjIW15 Xq3B3RJO/UFBLMMxNLerozvi7tTz40qEQkXb15BAhawAsk/UrJj4syZ28X/YY5D9uIFHdRmW47R xdCXFbXoy0Ig9N7y8r1ra+Q3JTFfcrvc2mczU8Y6jUOczBgjgLZiV86X/lzafgOH3yIc52RUQmP 5nVRuy1+0yKT9gLRb6CpG1FlxsWHtMTIxendSjIquh8PntuxqneQl9ZJvDt0HJOkkReQPDMCs= X-Received: by 2002:a05:600c:5250:b0:490:c2a2:b1d4 with SMTP id 5b1f17b1804b1-490e5620658mr22244115e9.35.1781171682267; Thu, 11 Jun 2026 02:54:42 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f351d69sm138649056f8f.29.2026.06.11.02.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 02:54:41 -0700 (PDT) Date: Thu, 11 Jun 2026 10:54:39 +0100 From: David Laight To: Andrew Morton Cc: Nathan Chancellor , Lasse Collin , Thorsten Blum , linux-kernel@vger.kernel.org Subject: Re: [PATCH] lib/xz: replace min_t with min Message-ID: <20260611105439.5df4b72e@pumpkin> In-Reply-To: <20260610164800.d0455e4da25f7101e382ee3a@linux-foundation.org> References: <20260609150030.634570-1-lasse.collin@tukaani.org> <20260610232323.GA1071374@ax162> <20260610164800.d0455e4da25f7101e382ee3a@linux-foundation.org> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) 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=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 10 Jun 2026 16:48:00 -0700 Andrew Morton wrote: > On Wed, 10 Jun 2026 16:23:23 -0700 Nathan Chancellor wrote: > > > On Tue, Jun 09, 2026 at 06:00:28PM +0300, Lasse Collin wrote: > > > From: Thorsten Blum > > > > > > Use the simpler min() macro since the values are unsigned and > > > compatible. > > > > > > Signed-off-by: Thorsten Blum > > > Reviewed-by: Lasse Collin > > > Signed-off-by: Lasse Collin > > ... > > > diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c > > > index 4b783ac94e71..9d80342b9c6b 100644 > > > --- a/lib/xz/xz_dec_lzma2.c > > > +++ b/lib/xz/xz_dec_lzma2.c > > > @@ -354,7 +354,7 @@ static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist) > > > if (dist >= dict->full || dist >= dict->size) > > > return false; > > > > > > - left = min_t(size_t, dict->limit - dict->pos, *len); > > > + left = min(dict->limit - dict->pos, *len); > > > *len -= left; > > > > > > back = dict->pos - dist - 1; > > > @@ -1098,9 +1098,8 @@ enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b) > > > * the output buffer yet, we may run this loop > > > * multiple times without changing s->lzma2.sequence. > > > */ > > > - dict_limit(&s->dict, min_t(size_t, > > > - b->out_size - b->out_pos, > > > - s->lzma2.uncompressed)); > > > + dict_limit(&s->dict, min(b->out_size - b->out_pos, > > > + s->lzma2.uncompressed)); > > > if (!lzma2_lzma(s, b)) > > > return XZ_DATA_ERROR; > > > > > > > These two hunks from this change in -next as 1003161e12ac ("lib/xz: > > replace min_t with min") cause warnings in the arch/powerpc/boot code, > > as it uses an old, simple version of min() and max() that does not have > > the improvements done in d03eba99f5bf ("minmax: allow > > min()/max()/clamp() if the arguments have the same signedness."): > > Well that's annoying. > > A pleasing solution would be to make the xz code be more consistent in its > type usage. struct lzma_dec has a liking for uintXX_t whereas struct > dictionary likes size_t. Perhaps a fundamental reexamination of what > these fields are representing is in order? > > Or change the ppc boot definitions to simple ones like: #define min(a, b) ({ \ auto _a = a; \ auto _b = b; \ _a < _b ? _a : _b; \ }) That remove the type check (fairly pointless!). (There isn't even a commit message that says someone got bitten by a negative value becoming a very large one.) -- David