From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67040A00BE for ; Fri, 22 May 2020 09:51:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 546D91D926; Fri, 22 May 2020 09:51:43 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id C14DE1D91C; Fri, 22 May 2020 09:51:39 +0200 (CEST) IronPort-SDR: a4TJlc7GBK1JKA+yLFDSjGVuJWoZ9DC9z3eKOq9V8rhsCwHg+vX/UCBDSGsnLmrvqgXua/2XeY 9fuaJMr6Dzhg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2020 00:51:38 -0700 IronPort-SDR: ytq5gTfzGGQz2l75iGBFPMxK8GuGFK7qSc8b5enlCgsu7k94r6KBi+/28zKAyj8HxAveqYDdks KkuQlTSM5rkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,420,1583222400"; d="scan'208";a="300597395" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga002.fm.intel.com with ESMTP; 22 May 2020 00:51:37 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 22 May 2020 00:51:37 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 22 May 2020 00:51:37 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 22 May 2020 00:51:37 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.47) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 22 May 2020 00:51:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oLgjvrXhFLNDVhchvF+McUntrL0AddlRQjmNW3WxIHiN/kxi3jgx5j5/z2IhyF0hy14yYQy3JGbMfUhYdLuipOiX+34TmJGu8uYU2362vib7Y6UiYbhacfrhYihwUDsa48BD+nqDpPouasohR5YRleZS8eKKnNaLY/T1h4wAQOsJyn3G2HqPtITwzzEpApAOAk5J9xir8P+LV9VYfvJdLyLwPZzQywGyIhBJtFUAmEX74POzTc2NIC5J1ZW9A2Xu+HKnl2qGFRNUUSN3e8fBq6X6fMpaIb8pi/ImvToHfxKJcWuC1sVrUfAxehTeKeoMaSMrPKkypdubmmR7vf5rUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jig2L/GxVLt84GuCxfDOI1kLh5TnTkUVFtoxKztLItU=; b=C5W91nW8sGXtVftdyk+kSDBJ8NQHE1d3jCpQEtVL4+iwyU75lyP8fXKlpxogLofmfThHVgFw8P0kE/TN1Mn7boT0ZQpMMsXNRLS1QIj21yQM7RaV8mYCnRq5ypBesDS/EvxhQUCpkFF3HOJGELDWAyaOL+DVyo/HjCYb9gC7t9MI16XprVRdzi8If6+NlO/G0gcL04eY0IpREVCh5FNRVatrcb/sCd3f9RhyYOb5YwtLxQgcLTttdVsoa4P0nCgmshF5tVGYLAyMH5L5xznW8gPNawTAG0YeD4Md4NSA4SxBY/KC/giNsk6hipyHKhum+EUcZZ0zioCdz5IJqp4LQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jig2L/GxVLt84GuCxfDOI1kLh5TnTkUVFtoxKztLItU=; b=A6ASwIjRjZNQhGN2iwcBWdUyGeX/piYRvFmNiHBMbBykIFZDMFv3v9ZW47QIe32Yp0RyJmpnlQ5GjCPIzOE5qRssz8ZMkLWvkONvG+MtmYxASV+fUwpGUpgRzHTkrC6TEsR17wI4ozNzqcbMKGJ598dN4mUU2eR5z7/F4T8r5pk= Received: from MN2PR11MB3582.namprd11.prod.outlook.com (2603:10b6:208:ec::28) by MN2PR11MB4464.namprd11.prod.outlook.com (2603:10b6:208:188::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Fri, 22 May 2020 07:51:33 +0000 Received: from MN2PR11MB3582.namprd11.prod.outlook.com ([fe80::a2:7e68:d1fe:77e8]) by MN2PR11MB3582.namprd11.prod.outlook.com ([fe80::a2:7e68:d1fe:77e8%5]) with mapi id 15.20.3021.024; Fri, 22 May 2020 07:51:33 +0000 From: "Yang, Qiming" To: "Sun, GuinanX" , "dev@dpdk.org" CC: "Zhao1, Wei" , "Sun, GuinanX" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/ixgbe: fix MAC security private API Thread-Index: AQHWL/YSqp9f7o8q50mM8EJWcxVnaqizuwjg Date: Fri, 22 May 2020 07:51:33 +0000 Message-ID: References: <20200522044010.26962-1-guinanx.sun@intel.com> In-Reply-To: <20200522044010.26962-1-guinanx.sun@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a2963691-97da-4162-73e0-08d7fe24f276 x-ms-traffictypediagnostic: MN2PR11MB4464: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:378; x-forefront-prvs: 04111BAC64 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wqvkA720u5ci9hxVeJosRSIr4o13VC4Zod5VUBYibgOlCN4qTvSZQnCj9glssIMNs8QDtfK1F4BGv5ggsJOWv4xX9towpv6DdspF+t2YVEVtTl7lHpBN1DeAf0/D5EBKd6OcmhTdk6Bdb3uTmKDwKqGCeYrQQSpZWG7ZwD00NXtHPipXrZ/P8iiveGnce5bGP2beqwxFw1PX374V7lmbLeSurpJejXlb8yd6k1JYd3dEiRlsKO4/Jy477zkFCksQYaVzQ2RZdFinanf+gG2Dmq75Ze66kkyBJcCHf+UyUmjAL2lh4LitDYQtL8Qa+6NfUWVZKWimnvJKnEH4G7JJrg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR11MB3582.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(346002)(39860400002)(136003)(366004)(396003)(4326008)(26005)(86362001)(55016002)(66946007)(15650500001)(53546011)(52536014)(6506007)(66476007)(66556008)(478600001)(64756008)(66446008)(7696005)(2906002)(76116006)(71200400001)(316002)(110136005)(54906003)(8936002)(8676002)(9686003)(5660300002)(450100002)(186003)(33656002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: 5YMJ/RKwWbGSE/BuP8M9ooAf9VLNc6M0R24fouh3+ZXbklQ8SazCRQvFWtinUJvZOg6fQf+vFLGHg1opImWieGfr2hMxyFfaz0CTpSs0+CPHQIP++v/Gq5yuNuVI7q+0LIDGoOchWEQLNIFhdVxOyGyiE+8yBdIkor+qCNvhquWppLLJGZibFC+MrVYSXQVgmupPA5FYCR86BpVASeIcVeF/RbFf3Z+5mQxI6BNb54wETeE6nZUHE6GovynXoykDW5LEnhfbjD/FNKR22/VmrWGL9GVnXeNU+QrnzCtca7CmzCLn0mJ4hGFVH0y6Y6/QZ2trghVH0Xv3fi6gFiAxTtFTfnkgYU3lL9o4FKYsGr+b8gpMtEN/YIrOyCTtRTe1PiN5aEGHGCkzV8M8lbHlc0IOttBWD6SL0y3iFyS1zmvO5VyASmZFZknT5nDoxHepdp+b1ndi74SJtBl5s7Jingo0a2MNma5GL2YkCxFD6Z0VKomf2UuJgSFdulwLueOM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: a2963691-97da-4162-73e0-08d7fe24f276 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2020 07:51:33.4982 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 6eqrfdoQiJB320HprPKhlulWIqO88XXl5UvblmcjNizCSyAkbsyD8rtJf1CT5ywvI+bLcHUc8UIvXiEZXsnjlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4464 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/ixgbe: fix MAC security private API X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi,=20 Do you copy the commit log of the other patch? I think this patch don't tou= ch any private API. Qiming > -----Original Message----- > From: dev On Behalf Of Guinan Sun > Sent: Friday, May 22, 2020 12:40 > To: dev@dpdk.org > Cc: Zhao1, Wei ; Sun, GuinanX > ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/ixgbe: fix MAC security private API >=20 > The driver type need to be checked in private API. > The patch fixes the issue. >=20 > Fixes: 50556c88104c ("net/ixgbe: fix MACsec setting") > Cc: stable@dpdk.org >=20 > Signed-off-by: Guinan Sun > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 14 ++++++++++++-- > drivers/net/ixgbe/ixgbe_ethdev.h | 4 ++-- > drivers/net/ixgbe/rte_pmd_ixgbe.c | 10 ++++++---- > 3 files changed, 20 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > b/drivers/net/ixgbe/ixgbe_ethdev.c > index f8a84c565..3e9c0f895 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -8988,7 +8988,7 @@ ixgbe_dev_macsec_setting_reset(struct > rte_eth_dev *dev) > macsec->replayprotect_en =3D 0; > } >=20 > -void > +int > ixgbe_dev_macsec_register_enable(struct rte_eth_dev *dev, > struct ixgbe_macsec_setting > *macsec_setting) { @@ -8997,6 +8997,9 @@ > ixgbe_dev_macsec_register_enable(struct rte_eth_dev *dev, > uint8_t en =3D macsec_setting->encrypt_en; > uint8_t rp =3D macsec_setting->replayprotect_en; >=20 > + if (!is_ixgbe_supported(dev)) > + return -ENOTSUP; > + > /** > * Workaround: > * As no ixgbe_disable_sec_rx_path equivalent is @@ -9057,14 > +9060,19 @@ ixgbe_dev_macsec_register_enable(struct rte_eth_dev *dev, > * just call the hand-written one directly for now. > */ > ixgbe_enable_sec_tx_path_generic(hw); > + > + return 0; > } >=20 > -void > +int > ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev) { > struct ixgbe_hw *hw =3D IXGBE_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > uint32_t ctrl; >=20 > + if (!is_ixgbe_supported(dev)) > + return -ENOTSUP; > + > /** > * Workaround: > * As no ixgbe_disable_sec_rx_path equivalent is @@ -9106,6 > +9114,8 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev) > * just call the hand-written one directly for now. > */ > ixgbe_enable_sec_tx_path_generic(hw); > + > + return 0; > } >=20 > RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd); diff --git > a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h > index 3d78b2ee2..c14cadab4 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.h > +++ b/drivers/net/ixgbe/ixgbe_ethdev.h > @@ -755,10 +755,10 @@ int ixgbe_action_rss_same(const struct > rte_flow_action_rss *comp, int ixgbe_config_rss_filter(struct rte_eth_de= v > *dev, > struct ixgbe_rte_flow_rss_conf *conf, bool add); >=20 > -void ixgbe_dev_macsec_register_enable(struct rte_eth_dev *dev, > +int ixgbe_dev_macsec_register_enable(struct rte_eth_dev *dev, > struct ixgbe_macsec_setting *macsec_setting); >=20 > -void ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev); > +int ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev); >=20 > void ixgbe_dev_macsec_setting_save(struct rte_eth_dev *dev, > struct ixgbe_macsec_setting *macsec_setting); diff --git > a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c > index 8bcaded6e..40cc7058f 100644 > --- a/drivers/net/ixgbe/rte_pmd_ixgbe.c > +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c > @@ -517,6 +517,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, > uint8_t en, uint8_t rp) { > struct rte_eth_dev *dev; > struct ixgbe_macsec_setting macsec_setting; > + int ret =3D 0; >=20 > RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); >=20 > @@ -528,15 +529,16 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, > uint8_t en, uint8_t rp) >=20 > ixgbe_dev_macsec_setting_save(dev, &macsec_setting); >=20 > - ixgbe_dev_macsec_register_enable(dev, &macsec_setting); > + ret =3D ixgbe_dev_macsec_register_enable(dev, &macsec_setting); >=20 > - return 0; > + return ret; > } >=20 > int > rte_pmd_ixgbe_macsec_disable(uint16_t port) { > struct rte_eth_dev *dev; > + int ret =3D 0; >=20 > RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); >=20 > @@ -544,9 +546,9 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port) >=20 > ixgbe_dev_macsec_setting_reset(dev); >=20 > - ixgbe_dev_macsec_register_disable(dev); > + ret =3D ixgbe_dev_macsec_register_disable(dev); >=20 > - return 0; > + return ret; > } >=20 > int > -- > 2.17.1