From nobody Fri Oct 10 12:53:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cjmrP5TlPz6C0Jg; Fri, 10 Oct 2025 12:53:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjmrP4r8Qz48BG; Fri, 10 Oct 2025 12:53:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760100805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tOek36Jfw5oQPp4X5FLLqXt21R+uzopnzsr0ERNO91c=; b=GzuXLlNA24oo/dm/j4u4NhS8WkVL/9JJ75BzOGpPqQm7gECIVNnbtDWFbgIxinel4MfS4O P5/jooB55idYt8kAIr8DPmpGTTojK8ZY92as2lsDew6lnONAmvI4MPIb4Q935n09+N+1lF LzZEBOw/PLkJUUPIEZJJ+10rDgkm9P/FqX5zDy3NpT9jqDo2G9bLktFh70R5OgAPoUHSc5 qZ8cBrlJRSTjLY+JEfmbsK7/G8gGrgaf+hR7UVuV66JVHDhStYKrBlFJd6C4g5RLJzPqwF BEFeEIAOeXTvOhW7ZQtg9zBW25wssTesllk/EVdGVEkdVSXWqdtBenaD9OH0Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760100805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tOek36Jfw5oQPp4X5FLLqXt21R+uzopnzsr0ERNO91c=; b=lzhOz8zFl+B3XZPT0YT/4ni9Jn7fY2UpHxexHa3bTmkorOaBRa6Njxmxic4g8Dhv07NoCK 9+Qb1pT1KVB/6ZxTIK9W2V/SShjhUKbQUjibfzq+XxgH3RCRKit2HkDh05w/bwMkbBq39S sLCLpVSDgSLkUp8Vtg5RFlK/7UrBgFOdFHTPw0stchNo6kH5LdV5ph3AKzFpAAgXy8Bpdc emGwsuoJdBeVLM41joVqYxMiHxvYvpHm8A6ZCrkCY58fBEfCjFUn9kEIMJtVZcbBdDZSLf iQ6nUClQKvTNFaS1fcn08i4Olgs14FxuK8zSaH4Z9bJ4AEgjiPGlOF769TgTOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760100805; a=rsa-sha256; cv=none; b=r5bVQa9y+BmOSPMJdArm/7x3+9tpXqCjbchU9J6D6wIy6iJ2SEcqK3oJ33ESwa+CKea8UO wbc4pXjxm2Iz1KaYhpz3XmHSNAuNY8pKIgqqyzLkqUuBE9ioAsxViLPVrfBVawQNE2pDTQ qznuPNCZ+9iiJ+KBx38OyLPY4iSuD6H28Mo/vX+VmX7gTh1/wG8sqAU+V1ZDpKa8Sb0Iqb bGgRX5zqLrrSCfr7BwnvRvcdYY94w9+f9u4oiM57T3H6ocDkLooJeesDCDgt5YGg0EtgNw ReWDt4JI++0l5A1gkK52QDvByD9xXMH6U5guocjvzWYGzou5gCiyz9a1+8SB7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:e934:5db:8908:7a87] (unknown [IPv6:2601:5c0:4202:5670:e934:5db:8908:7a87]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cjmrP32GrzxmT; Fri, 10 Oct 2025 12:53:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7467df7d-b01e-466c-8902-73a1f536c5a9@FreeBSD.org> Date: Fri, 10 Oct 2025 08:53:24 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 53825afc5dd1 - main - nvme: There's 64 LBAF descriptors, not 16 Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510100021.59A0LBYG001967@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510100021.59A0LBYG001967@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/9/25 20:21, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=53825afc5dd13f3d16c3db6727260d7184bcd581 > > commit 53825afc5dd13f3d16c3db6727260d7184bcd581 > Author: Warner Losh > AuthorDate: 2025-10-10 00:16:47 +0000 > Commit: Warner Losh > CommitDate: 2025-10-10 00:19:04 +0000 > > nvme: There's 64 LBAF descriptors, not 16 > > Older versions of the standard were limited to 16, but the actual limit > is 64. Bump the limit to 64. This should be a #define, but there's no > good standardized name, so I'm punting on that. All the places that use > it, apart from the byte swapping code, do the right thing and use the > nlbaf field to limit what to access. > > Sponsored by: Netflix > --- > sys/dev/nvme/nvme.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h > index 17c5cdb4db87..57cb37907e65 100644 > --- a/sys/dev/nvme/nvme.h > +++ b/sys/dev/nvme/nvme.h > @@ -1507,9 +1507,7 @@ struct nvme_namespace_data { > uint8_t eui64[8]; > > /** lba format support */ > - uint32_t lbaf[16]; > - > - uint8_t reserved7[192]; > + uint32_t lbaf[64]; > > uint8_t vendor_specific[3712]; > } __packed __aligned(4); > @@ -2175,7 +2173,7 @@ void nvme_namespace_data_swapbytes(struct nvme_namespace_data *s __unused) > s->anagrpid = le32toh(s->anagrpid); > s->nvmsetid = le16toh(s->nvmsetid); > s->endgid = le16toh(s->endgid); > - for (i = 0; i < 16; i++) > + for (i = 0; i < 64; i++) > s->lbaf[i] = le32toh(s->lbaf[i]); You could use `nitems(s->lbaf)` instead of 64 in this loop. -- John Baldwin