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 14EC842CBC for ; Thu, 15 Jun 2023 03:34:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EE5042D2F; Thu, 15 Jun 2023 03:34:41 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id AEB5F40DDA for ; Thu, 15 Jun 2023 03:34:39 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3f8d2bfed53so1763905e9.1 for ; Wed, 14 Jun 2023 18:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792879; x=1689384879; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=On64Dw8QWi7XopIeGq7NOx7EJSjnOacTS7uICt+Kobk=; b=GuvHOavUEpgj9pTGVbkiPDchX4CcwcmlBaflm+3aKqDIFXI0ZwqKD7uX4rzt6zCibo 6Vv51VbwbeC7M2eshg2biJlnpoRIJtgqIWGTjImdwUlovXJVDDunod81huoa1mJLiLcv spfBN/dHer9EUC6sL8uVm6MJVJIrNIRj2L/Y161ehkQblGKUpy4WHQj4BYfJocvzNbto oRXGaaOXHiiTO1CYS2B/Hookl0G8FNWXgLgKR46yoNhcYzi0OXjHNBb67GesuMj5GfDo PqN0xBkrf2eqQACpk821cTSvKXJNYDCI6kbxUR0hRBonEq7pIbq+k5YUAqAhlZ7+8Kva ZiUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792879; x=1689384879; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=On64Dw8QWi7XopIeGq7NOx7EJSjnOacTS7uICt+Kobk=; b=JqKxUAF7AZE72xZr8Xuh7I1cgywX4VCueNFAGpGJSbfbRd5+o4Gb7oceSrJeeQQZI2 /st7XP/Jb71WZhQsKenvjpUnTbrLAqsYSR7okBlQ+9rueMi6yCljfFosH5Rp34C+T63u SqGknQmhiWeH4/UmOa/YZ9ssnQZCCuyejrdU0p2/Fzhb2n1cqKKPbJIqFJ044Nqj5RU1 c+rQ5OFHQgQDweWg0rb32w2QAUW5xotSpwHZWZ4CLoohsG4Pg6+6+YziFuMv49rl+uP/ EHCmIjZarl6nmfUkJStTI8zfp+CiSFm0dcMtoztLKoxvUGkubOol1iEfNPEurPtsBbk/ ngNg== X-Gm-Message-State: AC+VfDx6plt3WhheDvwd5WqPaK5uD9omULOzPMCVWE8Jw1M+4feYkyoZ Jnqa0NUqmQ1SmxJufKs4iLn2UmMvW23T9mnF X-Google-Smtp-Source: ACHHUZ5EfSofigHT+L4oedg8awgG0IjtJT+acGiwiefDj326oYW0SLPC0GP1J2xVjoC8+5jqiCOhEg== X-Received: by 2002:a05:600c:5206:b0:3f7:3284:4e51 with SMTP id fb6-20020a05600c520600b003f732844e51mr2743068wmb.4.1686792879199; Wed, 14 Jun 2023 18:34:39 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id y24-20020a05600c365800b003f735ba7736sm18809202wmq.46.2023.06.14.18.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Ori Kam , dpdk stable Subject: patch 'doc: fix format in flow API guide' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:26 +0100 Message-Id: <20230615013258.1439718-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f4151bae8a345edbe7a74f378185cfaf45b01752 Thanks. Luca Boccassi --- >From f4151bae8a345edbe7a74f378185cfaf45b01752 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 24 May 2023 00:31:53 +0300 Subject: [PATCH] doc: fix format in flow API guide [ upstream commit 5d254667810fffe59190ca208a078bcb666a2a71 ] The modify field action description inside "Generic flow API (rte_flow)" documentation, lists all operations supported for a destination field. In addition, it lists the values supported for a encapsulation level field. Before the lists, in both cases, miss a blank line causing them to look regular text lines. This patch adds the blank lines. The asynchronous operations description inside "Generic flow API (rte_flow)" documentation, adds some bullets to describe asynchronous operations behavior. Before the first bullet, miss a blank line causing it to look a regular text line. This patch adds the blank line. The RSS action description inside "Generic flow API (rte_flow)" documentation, lists the values supported for a encapsulation level field. For "2" value, it uses 3 spaces as an indentation instead of 2 after line breaking, causing the first line to be bold. This patch updates the number of spaces in the indentation. Fixes: 73b68f4c54a0 ("ethdev: introduce generic modify flow action") Fixes: 197e820c6685 ("ethdev: bring in async queue-based flow rules operations") Fixes: 18aee2861a1f ("ethdev: add encap level to RSS flow API action") Signed-off-by: Michael Baum Acked-by: Ori Kam --- doc/guides/prog_guide/rte_flow.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 10e6d06853..6ac00d424f 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1800,8 +1800,8 @@ Also, regarding packet encapsulation ``level``: level. - ``2`` and subsequent values request RSS to be performed on the specified - inner packet encapsulation level, from outermost to innermost (lower to - higher values). + inner packet encapsulation level, from outermost to innermost (lower to + higher values). Values other than ``0`` are not necessarily supported. -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.360753612 +0100 +++ 0031-doc-fix-format-in-flow-API-guide.patch 2023-06-15 01:56:34.603542090 +0100 @@ -1 +1 @@ -From 5d254667810fffe59190ca208a078bcb666a2a71 Mon Sep 17 00:00:00 2001 +From f4151bae8a345edbe7a74f378185cfaf45b01752 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5d254667810fffe59190ca208a078bcb666a2a71 ] + @@ -31 +32,0 @@ -Cc: stable@dpdk.org @@ -36,2 +37,2 @@ - doc/guides/prog_guide/rte_flow.rst | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) + doc/guides/prog_guide/rte_flow.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -40 +41 @@ -index 27fa3dd304..7116c9ce23 100644 +index 10e6d06853..6ac00d424f 100644 @@ -43 +44 @@ -@@ -1968,8 +1968,8 @@ Also, regarding packet encapsulation ``level``: +@@ -1800,8 +1800,8 @@ Also, regarding packet encapsulation ``level``: @@ -54,38 +54,0 @@ -@@ -3049,20 +3049,23 @@ The immediate value ``RTE_FLOW_FIELD_VALUE`` (or a pointer to it - ``RTE_FLOW_FIELD_START`` is used to point to the beginning of a packet. - See ``enum rte_flow_field_id`` for the list of supported fields. - --``op`` selects the operation to perform on a destination field. -+``op`` selects the operation to perform on a destination field: -+ - - ``set`` copies the data from ``src`` field to ``dst`` field. - - ``add`` adds together ``dst`` and ``src`` and stores the result into ``dst``. --- ``sub`` subtracts ``src`` from ``dst`` and stores the result into ``dst`` -+- ``sub`` subtracts ``src`` from ``dst`` and stores the result into ``dst``. - - ``width`` defines a number of bits to use from ``src`` field. - - ``level`` is used to access any packet field on any encapsulation level --as well as any tag element in the tag array. --- ``0`` means the default behaviour. Depending on the packet type, it can --mean outermost, innermost or anything in between. -+as well as any tag element in the tag array: -+ -+- ``0`` means the default behaviour. Depending on the packet type, -+ it can mean outermost, innermost or anything in between. - - ``1`` requests access to the outermost packet encapsulation level. - - ``2`` and subsequent values requests access to the specified packet --encapsulation level, from outermost to innermost (lower to higher values). -+ encapsulation level, from outermost to innermost (lower to higher values). -+ - For the tag array (in case of multiple tags are supported and present) - ``level`` translates directly into the array index. - -@@ -3856,6 +3859,7 @@ Asynchronous operations - ----------------------- - - Flow rules management can be done via special lockless flow management queues. -+ - - Queue operations are asynchronous and not thread-safe. - - - Operations can thus be invoked by the app's datapath,