From owner-dev-commits-src-all@freebsd.org Sun Apr 11 12:25:14 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C16BA5CD222 for ; Sun, 11 Apr 2021 12:25:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJB0B4xjYz3Q52 for ; Sun, 11 Apr 2021 12:25:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f45.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so5292333wmi.3 for ; Sun, 11 Apr 2021 05:25:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=b+D2DQDOmjRg4DTbq5Axx+s8OFQH6gbaWh1oCu2lZD8=; b=jJdn769i9gfPlbt1trK9/M/ILQZyV38JHSf8AhUO4T4PZw6Wc81OWzfVEDFnhHKaTr R3L/N+OqaCPaPuxqoV66YfssTYNeVPm7XmNAb3IlzHyBFJazu4UPd1ZcW0mS7h4Jngei mc/Wp4LU6uhg7L7uxicN+opLiVgTa0qwwv0LgjYIt9NPNsv96rQO9RsBCIGAljJxb3Ek GMS2WSzV2kaOCKYMpHf94ICVjjpJPCVNOXw+WQbHmx29mWGBlvp+Ww6FlG7ryo9UGjyA +mv12L8NYrFcs8oUIzfshCOf+wGXIZaXmusyDla59sKCnjzFHpVeEClskDwkbzewdYDh TcMg== X-Gm-Message-State: AOAM530rRHutEjaWJwjwBWf2CDksmr6RpnSm07duXsnfM0kayil1WyVT pSdbUaqKIQ7zUgMgGrln6Nz5oweRI5ebYNEa X-Google-Smtp-Source: ABdhPJxKE13qlLZnOne2FVdzJGFwPiiP/TxxFzb562EvH0mLGYUD1MzL8vcy43jrwgc0OgbDIx9NRQ== X-Received: by 2002:a05:600c:3203:: with SMTP id r3mr5979893wmp.167.1618143912942; Sun, 11 Apr 2021 05:25:12 -0700 (PDT) Received: from [172.16.99.247] (global-184-7.nat-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id a22sm4225686wrc.59.2021.04.11.05.25.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 05:25:12 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: git: 97ed4babb516 - main - zfs: avoid memory allocation in arc_prune_async From: Jessica Clarke In-Reply-To: <202104110643.13B6h91E076304@gitrepo.freebsd.org> Date: Sun, 11 Apr 2021 13:25:11 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6F4745E7-CC46-4060-99A1-90C2A691EBC7@freebsd.org> References: <202104110643.13B6h91E076304@gitrepo.freebsd.org> To: Mateusz Guzik X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FJB0B4xjYz3Q52 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 12:25:14 -0000 On 11 Apr 2021, at 07:43, Mateusz Guzik wrote: >=20 > The branch main has been updated by mjg: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D97ed4babb51636d8a4b11bc7b207c321= 9ffcd0e3 >=20 > commit 97ed4babb51636d8a4b11bc7b207c3219ffcd0e3 > Author: Mateusz Guzik > AuthorDate: 2021-04-11 05:15:41 +0000 > Commit: Mateusz Guzik > CommitDate: 2021-04-11 05:19:56 +0000 >=20 > zfs: avoid memory allocation in arc_prune_async > --- > sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 16 = ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c = b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c > index 201dbc423336..e73efd810e53 100644 > --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c > +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c > @@ -158,10 +158,13 @@ arc_default_max(uint64_t min, uint64_t allmem) > static void > arc_prune_task(void *arg) > { > - int64_t nr_scan =3D *(int64_t *)arg; > +#ifdef __LP64__ > + int64_t nr_scan =3D (int64_t)arg; > +#else > + int64_t nr_scan =3D (int32_t)arg; > +#endif int64_t nr_scan =3D (intptr_t)arg;? > arc_reduce_target_size(ptob(nr_scan)); > - free(arg, M_TEMP); > #if __FreeBSD_version >=3D 1300139 > sx_xlock(&arc_vnlru_lock); > vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); > @@ -185,13 +188,14 @@ arc_prune_task(void *arg) > void > arc_prune_async(int64_t adjust) > { > - > int64_t *adjustptr; >=20 > - if ((adjustptr =3D malloc(sizeof (int64_t), M_TEMP, M_NOWAIT)) = =3D=3D NULL) > - return; > +#ifndef __LP64__ > + if (adjust > __LONG_MAX) > + adjust =3D __LONG_MAX; > +#endif The code is correct without the ifdef, is this just to suppress a = tautological condition warning? If so, be precise in your condition and use = __INT64_MAX__ > __LONG_MAX__? LP64 conflates a lot of things into one variable, and so = isn=E2=80=99t defined for CHERI, but IMO it=E2=80=99s better to be precise *anyway* = because then it=E2=80=99s more self-documenting why the #if is there. Jess