From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 069B345804 for ; Fri, 23 Aug 2024 18:22:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 022224336F; Fri, 23 Aug 2024 18:22:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AA761402BE for ; Fri, 23 Aug 2024 18:22:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430175; 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=yFFIsESC98SV09Yu9IUHpzmDl3v1SM7bkM10Q7d2JEk=; b=NYh35ad3U9sq6FgUtmd/eytk0SwNhblBq0qr/QxGEd6nkmxcb1kgJjbT0FMaQiHvRqxRiw KIeC7LL6LqOPjktDof1HXDxUuAFwHuS0pezkiWTZAVusU5D73gFlYCNGEdcZ3/sphPrJ3I +mlAAyv+tngpD5cf2YHEGFTg6GhgT1Y= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-510-22smP2LqNceK4u8cUADT6w-1; Fri, 23 Aug 2024 12:22:54 -0400 X-MC-Unique: 22smP2LqNceK4u8cUADT6w-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F3FB51955D54; Fri, 23 Aug 2024 16:22:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 628351956053; Fri, 23 Aug 2024 16:22:51 +0000 (UTC) From: Kevin Traynor To: Yahui Cao Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix masking when reading context' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:39 +0100 Message-ID: <20240823161929.1004778-91-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9e978c32852e55b760329865d50bb8be44222e9d Thanks. Kevin --- >From 9e978c32852e55b760329865d50bb8be44222e9d Mon Sep 17 00:00:00 2001 From: Yahui Cao Date: Wed, 26 Jun 2024 12:42:14 +0100 Subject: [PATCH] net/ice/base: fix masking when reading context [ upstream commit 045ff68c49244d998933ef74a719b96db0e43988 ] No need to invert mask since we only reserve the masked bits instead of clear them. Fixes: a03c714bfe0b ("net/ice/base: add two helper functions") Signed-off-by: Yahui Cao Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index c6fc32fbc6..49bbf3b461 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -4675,5 +4675,5 @@ ice_read_byte(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) ice_memcpy(&dest_byte, src, sizeof(dest_byte), ICE_DMA_TO_NONDMA); - dest_byte &= ~(mask); + dest_byte &= mask; dest_byte >>= shift_width; @@ -4715,5 +4715,5 @@ ice_read_word(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * correctly */ - src_word &= ~(CPU_TO_LE16(mask)); + src_word &= CPU_TO_LE16(mask); /* get the data back into host order before shifting */ @@ -4766,5 +4766,5 @@ ice_read_dword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * correctly */ - src_dword &= ~(CPU_TO_LE32(mask)); + src_dword &= CPU_TO_LE32(mask); /* get the data back into host order before shifting */ @@ -4817,5 +4817,5 @@ ice_read_qword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * correctly */ - src_qword &= ~(CPU_TO_LE64(mask)); + src_qword &= CPU_TO_LE64(mask); /* get the data back into host order before shifting */ -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.408228473 +0100 +++ 0091-net-ice-base-fix-masking-when-reading-context.patch 2024-08-23 17:18:09.791430353 +0100 @@ -1 +1 @@ -From 045ff68c49244d998933ef74a719b96db0e43988 Mon Sep 17 00:00:00 2001 +From 9e978c32852e55b760329865d50bb8be44222e9d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 045ff68c49244d998933ef74a719b96db0e43988 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index c14f66d55b..9a9c8f86e5 100644 +index c6fc32fbc6..49bbf3b461 100644 @@ -23,2 +24,2 @@ -@@ -5015,5 +5015,5 @@ ice_read_byte(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) - ice_memcpy(&dest_byte, src, sizeof(dest_byte), ICE_NONDMA_TO_NONDMA); +@@ -4675,5 +4675,5 @@ ice_read_byte(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) + ice_memcpy(&dest_byte, src, sizeof(dest_byte), ICE_DMA_TO_NONDMA); @@ -30 +31 @@ -@@ -5055,5 +5055,5 @@ ice_read_word(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) +@@ -4715,5 +4715,5 @@ ice_read_word(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) @@ -37 +38 @@ -@@ -5106,5 +5106,5 @@ ice_read_dword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) +@@ -4766,5 +4766,5 @@ ice_read_dword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) @@ -44 +45 @@ -@@ -5157,5 +5157,5 @@ ice_read_qword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) +@@ -4817,5 +4817,5 @@ ice_read_qword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info)