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 21E42A0555 for ; Wed, 25 May 2022 18:35:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19020400EF; Wed, 25 May 2022 18:35:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 935A6400EF for ; Wed, 25 May 2022 18:35:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496525; 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=YsIfvEvFTFEGu1JOpudqrPYmhTh4e0Bmwd4hIH3r1qM=; b=WOzn9XgG0jheiCK/MOCCb1cpKtbQstiGvXJSEgZycYL9joFQjRra+7q22OgPK7uz3L0emV /4nNg5HrrwwIb8y178buylOvOUxkSu4VS8f06hC4f1yHUc/KLtbtse5f4X0lRe0SEUJ53X +j69YPp2/8c8YfG4dSVnAcGJN9385Q8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-445-3kZr_aUxMVKw6dD8J0DXyQ-1; Wed, 25 May 2022 12:35:24 -0400 X-MC-Unique: 3kZr_aUxMVKw6dD8J0DXyQ-1 Received: by mail-wm1-f71.google.com with SMTP id l31-20020a05600c1d1f00b003974df9b91cso1399819wms.8 for ; Wed, 25 May 2022 09:35:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:from:to:cc:references:subject:in-reply-to :content-transfer-encoding; bh=YsIfvEvFTFEGu1JOpudqrPYmhTh4e0Bmwd4hIH3r1qM=; b=hgQpgXqaMaL0tNIIp/Y9HIcS8UYrDCTq3XjYUDkKt9F+xJUbrysRXYHe+2Wa6MU1FY gsqi8DlSS7ZbKTnn+K+czBsVk8pUjwWUtBRDNWqGpFqF05dQMvJ3MxZClvWAnYC721qs zhMgkV1LT0lDN72STlFFu5xlcbrA4+rsCmEykuKX2I2MTK4eVzwM7Re/H2HAdxKJdvYK SnL4SdNhuXu7LJOJuCTiOzh/m7jBAx4RooPiIhbT00h8ddAmVhutCypeSpFfcPNH9bKF 8PllyW2FJDsAuGBAn5OqSet3PoEkDpiSrjH9xMMKP0DZu1XwR891XFAFzS1ndrliiWoa q42w== X-Gm-Message-State: AOAM5308bo5YJdsxJJwtxmFGcRMXg/z+XuompKdhoX+eT/e84QPAAT0k ez4v6fh67zAJWkWfcSZ7+hjiW/r9Q7s8h5oSEkA6I1vgo49JveX73CKokRkhdhw6zpgBbfqeacC 1CmuGPLs= X-Received: by 2002:a7b:c928:0:b0:397:65f3:67b6 with SMTP id h8-20020a7bc928000000b0039765f367b6mr5510438wml.45.1653496522583; Wed, 25 May 2022 09:35:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6r/WmNVoOJT8b0JuZwYgM3Ms28NCVqmYM9mvtuDnargEvJZ4Y0+5jaIlVGDnhLKfGr6pmLA== X-Received: by 2002:a7b:c928:0:b0:397:65f3:67b6 with SMTP id h8-20020a7bc928000000b0039765f367b6mr5510422wml.45.1653496522353; Wed, 25 May 2022 09:35:22 -0700 (PDT) Received: from [192.168.0.36] ([78.17.181.1]) by smtp.gmail.com with ESMTPSA id a19-20020a05600c349300b00397071b10dfsm2405556wmq.10.2022.05.25.09.35.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 May 2022 09:35:21 -0700 (PDT) Message-ID: <4b8a9d30-7861-d4a6-9e87-ea0fcfb22fdc@redhat.com> Date: Wed, 25 May 2022 17:35:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 From: Kevin Traynor To: Satha Rao Cc: Jerin Jacob , dpdk stable References: <20220525162847.711753-1-ktraynor@redhat.com> <20220525162847.711753-34-ktraynor@redhat.com> Subject: Re: patch 'common/cnxk: fix SQ flush sequence' has been queued to stable release 21.11.2 In-Reply-To: <20220525162847.711753-34-ktraynor@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 On 25/05/2022 17:28, Kevin Traynor wrote: > Hi, > > FYI, your patch has been queued to stable release 21.11.2 > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 05/30/22. 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/8790891a6dac401fe968022272e31a14d6b99fb9 > > Thanks. > > Kevin > > --- > From 8790891a6dac401fe968022272e31a14d6b99fb9 Mon Sep 17 00:00:00 2001 > From: Satha Rao > Date: Sun, 8 May 2022 13:18:16 +0530 > Subject: [PATCH] common/cnxk: fix SQ flush sequence > > [ upstream commit e746aec161cc5642935e1ac4b823bdb2d722ec27 ] > > Fix SQ flush sequence to issue NIX RX SW Sync after SMQ flush. > This sync ensures that all the packets that were in-flight are > flushed out of memory. > > This patch also fixes NULL return issues reported by > static analysis tool in Traffic Manager and sync's mailbox > to that of the kernel version. > > Fixes: 05d727e8b14a ("common/cnxk: support NIX traffic management") > Fixes: 0b7e667ee303 ("common/cnxk: enable packet marking") > Please check this patch. In general, fixing different issues from different releases in the same patch should be avoided, as it makes it a bit more difficult to backport. Need to check that there isn't dependencies between the parts that apply and the parts that don't etc. Thanks. > Signed-off-by: Satha Rao > Acked-by: Jerin Jacob > --- > drivers/common/cnxk/roc_mbox.h | 35 ++++++++++++++++++++++++++++++-- > drivers/common/cnxk/roc_nix_tm.c | 7 +++++++ > 2 files changed, 40 insertions(+), 2 deletions(-) > > diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h > index b63fe108c9..9a8ae6b216 100644 > --- a/drivers/common/cnxk/roc_mbox.h > +++ b/drivers/common/cnxk/roc_mbox.h > @@ -115,5 +115,5 @@ struct mbox_msghdr { > M(SSO_GRP_GET_PRIORITY, 0x606, sso_grp_get_priority, sso_info_req, \ > sso_grp_priority) \ > - M(SSO_WS_CACHE_INV, 0x607, sso_ws_cache_inv, msg_req, msg_rsp) \ > + M(SSO_WS_CACHE_INV, 0x607, sso_ws_cache_inv, ssow_lf_inv_req, msg_rsp) \ > M(SSO_GRP_QOS_CONFIG, 0x608, sso_grp_qos_config, sso_grp_qos_cfg, \ > msg_rsp) \ > @@ -124,4 +124,7 @@ struct mbox_msghdr { > M(SSO_HW_RELEASE_XAQ, 0x611, sso_hw_release_xaq_aura, \ > sso_hw_xaq_release, msg_rsp) \ > + M(SSO_CONFIG_LSW, 0x612, ssow_config_lsw, ssow_config_lsw, msg_rsp) \ > + M(SSO_HWS_CHNG_MSHIP, 0x613, ssow_chng_mship, ssow_chng_mship, \ > + msg_rsp) \ > /* TIM mbox IDs (range 0x800 - 0x9FF) */ \ > M(TIM_LF_ALLOC, 0x800, tim_lf_alloc, tim_lf_alloc_req, \ > @@ -248,5 +251,6 @@ struct mbox_msghdr { > nix_bp_cfg_rsp) \ > M(NIX_CPT_BP_DISABLE, 0x8021, nix_cpt_bp_disable, nix_bp_cfg_req, \ > - msg_rsp) > + msg_rsp) \ > + M(NIX_RX_SW_SYNC, 0x8022, nix_rx_sw_sync, msg_req, msg_rsp) > > /* Messages initiated by AF (range 0xC00 - 0xDFF) */ > @@ -1241,4 +1245,31 @@ struct ssow_lf_free_req { > }; > > +#define SSOW_INVAL_SELECTIVE_VER 0x1000 > +struct ssow_lf_inv_req { > + struct mbox_msghdr hdr; > + uint16_t nb_hws; /* Number of HWS to invalidate*/ > + uint16_t hws[MAX_RVU_BLKLF_CNT]; /* Array of HWS */ > +}; > + > +struct ssow_config_lsw { > + struct mbox_msghdr hdr; > +#define SSOW_LSW_DIS 0 > +#define SSOW_LSW_GW_WAIT 1 > +#define SSOW_LSW_GW_IMM 2 > + uint8_t __io lsw_mode; > +#define SSOW_WQE_REL_LSW_WAIT 0 > +#define SSOW_WQE_REL_IMM 1 > + uint8_t __io wqe_release; > +}; > + > +struct ssow_chng_mship { > + struct mbox_msghdr hdr; > + uint8_t __io set; /* Membership set to modify. */ > + uint8_t __io enable; /* Enable/Disable the hwgrps. */ > + uint8_t __io hws; /* HWS to modify. */ > + uint16_t __io nb_hwgrps; /* Number of hwgrps in the array */ > + uint16_t __io hwgrps[MAX_RVU_BLKLF_CNT]; /* Array of hwgrps. */ > +}; > + > struct sso_hw_setconfig { > struct mbox_msghdr hdr; > diff --git a/drivers/common/cnxk/roc_nix_tm.c b/drivers/common/cnxk/roc_nix_tm.c > index ebb27a3106..506cb066ce 100644 > --- a/drivers/common/cnxk/roc_nix_tm.c > +++ b/drivers/common/cnxk/roc_nix_tm.c > @@ -565,4 +565,5 @@ nix_tm_sq_flush_pre(struct roc_nix_sq *sq) > struct nix_tm_node_list *list; > enum roc_nix_tm_tree tree; > + struct msg_req *req; > struct mbox *mbox; > struct nix *nix; > @@ -654,4 +655,10 @@ nix_tm_sq_flush_pre(struct roc_nix_sq *sq) > goto cleanup; > } > + > + req = mbox_alloc_msg_nix_rx_sw_sync(mbox); > + if (!req) > + return -ENOSPC; > + > + rc = mbox_process(mbox); > cleanup: > /* Restore cgx state */