From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5ADAE3A9615 for ; Tue, 19 May 2026 10:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779186159; cv=none; b=IyqGlxbBwQUHQ36gPDNwMtQWdfJx8fehIAPGvrihkUrvcnnMJIA/wXpIIFwtytSAZi24vUATA672+5p2j1h3AA0zTmBZdPZnPih9M8k9+UmuM2q6qyqHX0CDlueZuDJ70n8lyGjAU5fqER6gc9/xcmeVU4+6qOB/8mXDqGCcLEo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779186159; c=relaxed/simple; bh=PnXentWPsyoPKjP40iCcdK35fQI5gIzpIF96ZXj4bfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=ptsdkVEJn+pp4fsOEV/EDufzOWdVNCqfW9zqM/1E0t+BLVm7RHLsvE87J9caTo9H5UM/pBnutFy9XiUKSm65/dODlUlOUF7bixrP2T10K69ypC395/cmsr8G7WNgh6aEBXcvEjNivCA95fA3zzVqsJKD670T6dwz1RSHuSuWdXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BQcFqmO4; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BQcFqmO4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779186156; h=from:from: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; bh=x2zkQ8QHVerDmJclJusaydT7y/LVeo8p20ja76pOAZo=; b=BQcFqmO48aGqNJmOFQebc3D4SLuZ1zZWtj1o1+PSVXWYVQ3ybGQ8iZdiFPTS5tzBhjRr2B Ce4IWXmbwsWuI7C5X2dxkRhU8KhqK0WCopypLnJOEkHdBJDPDKq84EmINwPwn/yglogjDV OcoB3y0plW9JEW9Wg9T+Fyh7TpPrJPI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-4W1A-IuaM_-iYZyyLrpYNA-1; Tue, 19 May 2026 06:22:32 -0400 X-MC-Unique: 4W1A-IuaM_-iYZyyLrpYNA-1 X-Mimecast-MFC-AGG-ID: 4W1A-IuaM_-iYZyyLrpYNA_1779186150 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 752EB180034E; Tue, 19 May 2026 10:22:30 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.48.33]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4A180180034E; Tue, 19 May 2026 10:22:27 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Stefan Metzmacher , Mina Almasry , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org Subject: [RFC PATCH 05/36] cifs: Introduce an ALIGN8() macro Date: Tue, 19 May 2026 11:21:23 +0100 Message-ID: <20260519102158.592165-6-dhowells@redhat.com> In-Reply-To: <20260519102158.592165-1-dhowells@redhat.com> References: <20260519102158.592165-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: netfs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-MFC-PROC-ID: yOu3R9BGHkv9EulQf03V4w9SN21bhiuEku-bvTKBUEQ_1779186150 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true The PDU generation seems to do ALIGN(x, 8) a lot, so make a macro for that. Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Shyam Prasad N cc: Tom Talpey cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/cifsglob.h | 2 ++ fs/smb/client/reparse.c | 2 +- fs/smb/client/smb2file.c | 3 +-- fs/smb/client/smb2misc.c | 2 +- fs/smb/client/smb2pdu.c | 28 ++++++++++++++-------------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index fc4028b5b5c8..69924b01dd2c 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -2392,4 +2392,6 @@ static inline int cifs_open_create_options(unsigned int oflags, int opts) */ #define CIFS_INO_BLOCKS(size) DIV_ROUND_UP_ULL((u64)(size), 512) +#define ALIGN8(x) ALIGN((x), 8) + #endif /* _CIFS_GLOB_H */ diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index cd1e1eaee67a..f6f9093e04fd 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -575,7 +575,7 @@ static struct smb2_create_ea_ctx *ea_create_context(u32 dlen, size_t *cc_len) { struct smb2_create_ea_ctx *cc; - *cc_len = round_up(sizeof(*cc) + dlen, 8); + *cc_len = ALIGN8(sizeof(*cc) + dlen); cc = kzalloc(*cc_len, GFP_KERNEL); if (!cc) return ERR_PTR(-ENOMEM); diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c index 6860eff31693..152ede08cd09 100644 --- a/fs/smb/client/smb2file.c +++ b/fs/smb/client/smb2file.c @@ -48,10 +48,9 @@ static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov) cifs_dbg(FYI, "%s: skipping unhandled error context: 0x%x\n", __func__, le32_to_cpu(p->ErrorId)); - len = ALIGN(le32_to_cpu(p->ErrorDataLength), 8); + len = ALIGN8(le32_to_cpu(p->ErrorDataLength)); if (len > end - ((u8 *)p + sizeof(*p))) return ERR_PTR(-EINVAL); - p = (struct smb2_error_context_rsp *)(p->ErrorContextData + len); } } else if (le32_to_cpu(err->ByteCount) >= sizeof(*sym) && diff --git a/fs/smb/client/smb2misc.c b/fs/smb/client/smb2misc.c index 2a7355ce1a07..6194d677b0ba 100644 --- a/fs/smb/client/smb2misc.c +++ b/fs/smb/client/smb2misc.c @@ -255,7 +255,7 @@ smb2_check_message(char *buf, unsigned int pdu_len, unsigned int len, * Some windows servers (win2016) will pad also the final * PDU in a compound to 8 bytes. */ - if (ALIGN(calc_len, 8) == len) + if (ALIGN8(calc_len) == len) return 0; /* diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 971b075e2e7d..2d9fe803682e 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -652,14 +652,14 @@ build_signing_ctxt(struct smb2_signing_capabilities *pneg_ctxt) /* * Context Data length must be rounded to multiple of 8 for some servers */ - pneg_ctxt->DataLength = cpu_to_le16(ALIGN(sizeof(struct smb2_signing_capabilities) - + pneg_ctxt->DataLength = cpu_to_le16(ALIGN8(sizeof(struct smb2_signing_capabilities) - sizeof(struct smb2_neg_context) + - (num_algs * sizeof(u16)), 8)); + (num_algs * sizeof(u16)))); pneg_ctxt->SigningAlgorithmCount = cpu_to_le16(num_algs); pneg_ctxt->SigningAlgorithms[0] = cpu_to_le16(SIGNING_ALG_AES_CMAC); ctxt_len += sizeof(__le16) * num_algs; - ctxt_len = ALIGN(ctxt_len, 8); + ctxt_len = ALIGN8(ctxt_len); return ctxt_len; /* TBD add SIGNING_ALG_AES_GMAC and/or SIGNING_ALG_HMAC_SHA256 */ } @@ -696,7 +696,7 @@ build_netname_ctxt(struct smb2_netname_neg_context *pneg_ctxt, char *hostname) /* copy up to max of first 100 bytes of server name to NetName field */ pneg_ctxt->DataLength = cpu_to_le16(2 * cifs_strtoUTF16(pneg_ctxt->NetName, hostname, 100, cp)); /* context size is DataLength + minimal smb2_neg_context */ - return ALIGN(le16_to_cpu(pneg_ctxt->DataLength) + sizeof(struct smb2_neg_context), 8); + return ALIGN8(le16_to_cpu(pneg_ctxt->DataLength) + sizeof(struct smb2_neg_context)); } static void @@ -742,18 +742,18 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, * round up total_len of fixed part of SMB3 negotiate request to 8 * byte boundary before adding negotiate contexts */ - *total_len = ALIGN(*total_len, 8); + *total_len = ALIGN8(*total_len); pneg_ctxt = (*total_len) + (char *)req; req->NegotiateContextOffset = cpu_to_le32(*total_len); build_preauth_ctxt((struct smb2_preauth_neg_context *)pneg_ctxt); - ctxt_len = ALIGN(sizeof(struct smb2_preauth_neg_context), 8); + ctxt_len = ALIGN8(sizeof(struct smb2_preauth_neg_context)); *total_len += ctxt_len; pneg_ctxt += ctxt_len; build_encrypt_ctxt((struct smb2_encryption_neg_context *)pneg_ctxt); - ctxt_len = ALIGN(sizeof(struct smb2_encryption_neg_context), 8); + ctxt_len = ALIGN8(sizeof(struct smb2_encryption_neg_context)); *total_len += ctxt_len; pneg_ctxt += ctxt_len; @@ -782,7 +782,7 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, if (server->compression.requested) { build_compression_ctxt((struct smb2_compression_capabilities_context *) pneg_ctxt); - ctxt_len = ALIGN(sizeof(struct smb2_compression_capabilities_context), 8); + ctxt_len = ALIGN8(sizeof(struct smb2_compression_capabilities_context)); *total_len += ctxt_len; pneg_ctxt += ctxt_len; neg_context_count++; @@ -973,7 +973,7 @@ static int smb311_decode_neg_context(struct smb2_negotiate_rsp *rsp, * aligned offset following the previous negotiate context. */ if (i + 1 != ctxt_cnt) - clen = ALIGN(clen, 8); + clen = ALIGN8(clen); if (clen > len_of_ctxts) break; @@ -2702,7 +2702,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) unsigned int group_offset = 0; struct smb3_acl acl = {}; - *len = round_up(sizeof(struct crt_sd_ctxt) + (sizeof(struct smb_ace) * 4), 8); + *len = ALIGN8(sizeof(struct crt_sd_ctxt) + (sizeof(struct smb_ace) * 4)); if (set_owner) { /* sizeof(struct owner_group_sids) is already multiple of 8 so no need to round */ @@ -2777,7 +2777,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) memcpy(aclptr, &acl, sizeof(struct smb3_acl)); buf->ccontext.DataLength = cpu_to_le32(ptr - (__u8 *)&buf->sd); - *len = round_up((unsigned int)(ptr - (__u8 *)buf), 8); + *len = ALIGN8((unsigned int)(ptr - (__u8 *)buf)); return buf; } @@ -2870,7 +2870,7 @@ alloc_path_with_tree_prefix(__le16 **out_path, int *out_size, int *out_len, * final path needs to be 8-byte aligned as specified in * MS-SMB2 2.2.13 SMB2 CREATE Request. */ - *out_size = round_up(*out_len * sizeof(__le16), 8); + *out_size = ALIGN8(*out_len * sizeof(__le16)); *out_path = kzalloc(*out_size + sizeof(__le16) /* null */, GFP_KERNEL); if (!*out_path) return -ENOMEM; @@ -3141,7 +3141,7 @@ SMB2_open_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, uni_path_len = (2 * UniStrnlen((wchar_t *)path, PATH_MAX)) + 2; /* MUST set path len (NameLength) to 0 opening root of share */ req->NameLength = cpu_to_le16(uni_path_len - 2); - copy_size = round_up(uni_path_len, 8); + copy_size = ALIGN8(uni_path_len); copy_path = kzalloc(copy_size, GFP_KERNEL); if (!copy_path) return -ENOMEM; @@ -4580,7 +4580,7 @@ smb2_new_read_req(void **buf, unsigned int *total_len, if (request_type & CHAINED_REQUEST) { if (!(request_type & END_OF_CHAIN)) { /* next 8-byte aligned request */ - *total_len = ALIGN(*total_len, 8); + *total_len = ALIGN8(*total_len); shdr->NextCommand = cpu_to_le32(*total_len); } else /* END_OF_CHAIN */ shdr->NextCommand = 0;