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 73123A0032 for ; Tue, 12 Jul 2022 09:47:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EDFB410EF; Tue, 12 Jul 2022 09:47:12 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 5AD47410EF for ; Tue, 12 Jul 2022 09:47:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657612030; x=1689148030; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=reX005qJ/OgmmLh/ZHlmyd05c+5g7dtBItLEb/VMqhE=; b=eYADamS0iVYXk6USvVmRkreIutoF58y86i7dxh9JJWugz3jtULTSRl6x fndcn987IVFUqEEaeZsZBtvEHus7yY9vLhdwKGm6VYvdwz/hAuEPeDrfC d5HkvIpuuooXp3DQ6K1FQozBVlj4FdzrwaoIf+6H4HwDE43JceZQWfNP+ or05nEEk+oySwcl1IzNE9NQt74jAdgPimcqTns+csPW3V84eCEANWSGu/ ntsyu3nB/casM9CEGObug0rf+zt94a8PrUoJFt77fOAf0N4p5XllTzO0C TiPw7kJRGW5p+7leXCnx+n32UKCT0wyR8PHg4azHzGhyzYhDuCvn+fZ3I g==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="348841843" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="348841843" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 00:47:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="595195927" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga002.jf.intel.com with ESMTP; 12 Jul 2022 00:47:05 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 12 Jul 2022 00:47:04 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 12 Jul 2022 00:47:04 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.175) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 12 Jul 2022 00:47:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKllx0J3w0j0cg0oWx/0XG2XRthXNIM9jbs1PNwb5ywea/wfjzP5NXWaF3xuoi9+OCNG3bBnF7j6wuccCJAQERYYsCwCOIlWHLccE1+RsYclNypLZXxfeMsg7fzne3PXe9JyhzpOPlBdNo0Wmpb7S021jIHGG6KmYp8A2QQ63fx2/3vtPKTPCDbbXCkjBwGiJG+GUmH04pKGl95/qx/RfdlM2x77c8IBzYXaPyOs4y0ZMOw81hBksz1Kers9DP9cJQATok+BYjkBHEbRk1CSWgW+9eByALbOOLi9P476si5v1uGEaPjmRgcUX+c7oa+aX3wISzVnWrq5awtXsNTP3g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mQ1Zm5NH22hFlbBFKDOQIZt5Hm1fjp8oZtVa23X0htk=; b=jkluvtTQ6bmTANwFWrZvif29mDaFjbP1AzbvlJOoyp0FeO8TEW+IQSm2YJUAsU1G3fNgM6kmZG4/06ngT3BF5yAqsJ1mQtgDnwuXItBmfGXEC7B49heFfmxyB9ysHiRKfe4Vqt3UStOejCe91iqpp5tXSoFaWvoAnRix3TIEGBR3r4hhxglt6WGuwXhXHmwuQ2rhH4evHnsP4tcF8RUJwCLLPYzTgvTgWkVbSBVDZyUYU19jCARhf0Q7puzVb8xD+lOiWpxg3p5WPoE4qspndq4SLx15HbAp99hmiPUNUUM4YRxnhLOGK0hRxldvMclKtLIeZmwhEi+3sxlE+2JHYA== 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 Received: from DM5PR11MB1739.namprd11.prod.outlook.com (2603:10b6:3:111::22) by CH2PR11MB4487.namprd11.prod.outlook.com (2603:10b6:610:44::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Tue, 12 Jul 2022 07:47:02 +0000 Received: from DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::59a:a470:e07d:74bc]) by DM5PR11MB1739.namprd11.prod.outlook.com ([fe80::59a:a470:e07d:74bc%11]) with mapi id 15.20.5417.026; Tue, 12 Jul 2022 07:47:02 +0000 From: "Pei, Andy" To: "christian.ehrhardt@canonical.com" CC: Maxime Coquelin , dpdk stable Subject: RE: patch 'vdpa/ifc/base: fix null pointer dereference' has been queued to stable release 19.11.13 Thread-Topic: patch 'vdpa/ifc/base: fix null pointer dereference' has been queued to stable release 19.11.13 Thread-Index: AQHYlcNj/Bo/fPrSGkqh9bNQ+tgZpa16W3ug Date: Tue, 12 Jul 2022 07:47:02 +0000 Message-ID: References: <20220712074522.3704914-1-christian.ehrhardt@canonical.com> <20220712074522.3704914-2-christian.ehrhardt@canonical.com> In-Reply-To: <20220712074522.3704914-2-christian.ehrhardt@canonical.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.500.17 dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1f7db481-1fdc-4253-6ff6-08da63dab563 x-ms-traffictypediagnostic: CH2PR11MB4487:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wa9kweoHZum0H36YNuYcVOS/Oa6ViZk2EdNmi7wMm0FApoYPY0FBkdb5O9df8werthkPGw+dbwyz2jg3RyU1Rp/KTiCEUE7hS0xHOIkw1m9y/GHZK/98rVs6pPTEyo3iUAhZtixxlLu0mndVhs2FWjmTqllotAUdOca8xhFarOmuLwqYMWuyO3QpiYFfytI6h1gYBI7nWJls7xQXEVusMK8Th8Q9OK8b0k4gIU1TkrupQbP/gEKTayXp5SIiytVjcz5JHYVgPHHz5UhoVyCvc30ySdpC9teC/IHr03veACDpcRJ6a2wZda2PRDPHElTL7jGAxJSSRGr9mUsEwUBei3wJrg5EvLtGe2iD60x98609exQLAZw/NfqxvKyZ3MxRDuYYogPy61C/PqoJ6IkuSssLgNlozPn0tbAnE47pnlw4wpebS5XCygtJNYHa5Ald0kbz+ThfT1pv+sTXw/A/7/N5Cu7GqPTznw5agvlhfp/4PPOjKSQmicxqWKUgxfsydGRA5b1XcjW+53TcW4RACPXCqwXwPZsHJLujbpZcSWvHQEL8YJdAEV3XghIMtfZ+JEc+R3quG4kmI2h8H/5rXH7yqKbSwECpT2R3v1Ex0BkzNhZyZOJ3ab21LxBbCriwu5Q7L07DGTB2PdWMHwX8aS8tXftDoYKDepE2WPmto8re4yxXR7FGhTdUVVGJ57XoMOuZ+EO5NWbTOK3s5e8MHDSMpuf52yBeLNcxMu9ZNoRFCulWf7LCW/86zaFPRbxJUR27qebg/F9JJ5HlP8baYTM36iEFDAGCquJwNACWt9ropoj5NlS0vOTs/IdgnbMdCI2MkSjJUCdAgsY7qoP+otI2HawErTc2yub8unqXAXA5q0SAw9tLSS94b5mYtiY2 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1739.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(136003)(396003)(376002)(346002)(366004)(39860400002)(7696005)(86362001)(6506007)(186003)(4326008)(41300700001)(53546011)(64756008)(478600001)(83380400001)(26005)(66556008)(66446008)(38070700005)(82960400001)(38100700002)(9686003)(8936002)(55016003)(2906002)(66946007)(122000001)(52536014)(33656002)(5660300002)(71200400001)(6916009)(54906003)(966005)(316002)(66476007)(8676002)(76116006); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?C3b8AvqmSyUUTwCWVhvgJY1IxhWQe1LTl954Pbl79SRkJwV38Vi8f5I5nlZo?= =?us-ascii?Q?HDHwJkhg1K0k1hGTeVt0jvE0CFFmJenrHfumn7PpEGPqjnF2dfowpZlLdHlL?= =?us-ascii?Q?LoH4xtwq38pyTE7NSWj5/uQzJrWGQxrh4pRc5Git6Gh73fe0t/3mqaWwgMKV?= =?us-ascii?Q?hNTlNoFXiGfPyXk4RK2fXmCbyS6UCn8ON80/rBxpuWEPfPLDHgb1KabW/r0L?= =?us-ascii?Q?WfFSD2NyuQ1JcwMVJP9HQTeH3MOjZtk7JBgxZAX5fHBf3D762eFFaqw5cxB+?= =?us-ascii?Q?EtUDCkQtkiLJCXnCsDfDWlDZPol7n3/OUIQe6XHMRS/B24+ceDP4eHOvIF9I?= =?us-ascii?Q?tTjCJbnTWvM3GT7PhR3FZOAJTn8wu+LHNMSv1rB2KlLoxA/ZaSbxj3likf1m?= =?us-ascii?Q?WmNdinAEreXiNOkNOmOHODNxeqpR61h2kNHb631BfGJdjTJxC3DxkVVL2mBh?= =?us-ascii?Q?Kwps2+3aFxdbX1RhEtOpLKPa4ZCz4SKKPEvBnNYD2cMPLeiAG3y6LEIVu8yT?= =?us-ascii?Q?b0OLyVB4I0tel8CBTj0dZ2yIwFh71xjgYc4Z1EaB1exJVHJ0oDpKgkoie4FL?= =?us-ascii?Q?sLta/vOR0GQOpe9VdEv2yDr6D7spH2mF+BmH6VEu/nroGZxoe9UZpPmHVsnY?= =?us-ascii?Q?yYLakSPx41IQpQpwteNbp/+HYoSBDpwm8kWOLeqRyN/JuB7b6j8pJyv7YScT?= =?us-ascii?Q?+NzRRUMenrrWJFKDNSo0y4+RJw8Pmffhxn8OAcGuBKUbUJyafAtjr/0D/jVu?= =?us-ascii?Q?W6S35PWkx/Ht6OmvQAaMDDWFzlI/qssI4Zrd0Q+jSIiXzRz/tRqhsSuivrYu?= =?us-ascii?Q?xjbz4hK/QPLArDf1xUpYqmwMY67qJWf5BsMYR2Da7xGn4pLG0ukGJDnVOx6Q?= =?us-ascii?Q?4CF6DVGJ2XDW+03yo9NHRBiHGfrvGz+ILpMs2lEdmM0WwCVfBR182kkKXtMj?= =?us-ascii?Q?sD7tnVVLXzCLjNMRpWZo0keuoAOvlHteLwMTF8PyXaJ/zkrZj8Mb7lsssap4?= =?us-ascii?Q?Z0fwTIlBWl0LhzPKsNiT7vpX9IMTvtDv0whkfrUWyjRMG2tPhVxTSJGfC5pd?= =?us-ascii?Q?V4kfDKMkVRCkHvcxFCVvgzYl27BdCifop89Pd65bG8vUaPTO0ajBfiR37YS2?= =?us-ascii?Q?OnZURqFj6uZHdI3eYjsoSRf4V10yhGkKomdJCWsX83itEDV99v9gwk2VWC96?= =?us-ascii?Q?y6OIvK6nxZgAMFpNl7JRF/xqBjkzvr5/ba6D08ifHyqm6S7skSQzTKnzhidJ?= =?us-ascii?Q?KRd6UD7RIQYzhCuk8NUSo2B49m7OcvfDCnJ0IZTzv+i8XpWRaoW9d/cGILnI?= =?us-ascii?Q?GkeD1zh40Pyg2jWi40tLy2YvGu5LIiojqT81LDvJPe94kgKzyP1IzR/XTA0o?= =?us-ascii?Q?naSMfgR5br0kQQ1LcH48APw90rAazeUjqVxLe6H23NtrGdqjRLFVyX1ZplHf?= =?us-ascii?Q?NOw1wekgiP0RvDcGCJ1XfdjIuUfIBe3CXAzjG8nprRQ0fShicmMT3XNbEK+R?= =?us-ascii?Q?Nm0A8NIsUfhdOng8PiF552JJKzvD0gRzWNhTDu94kP/AtD5fSMdjnc0BV55s?= =?us-ascii?Q?A0eduW1pzHWXwEJnaWC6oUPV7DHSie+HnfJGFvdu?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1739.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f7db481-1fdc-4253-6ff6-08da63dab563 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jul 2022 07:47:02.3090 (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: t+R+lIXHyCoAWo6LWAJlL3xH2HgCjGFnPgtCZ6KWIsmlNss1wqRjlwMjUFo3svA5mbO7KLWWF6qdWjlk6gOP5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR11MB4487 X-OriginatorOrg: intel.com 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 Christian, Thanks. > -----Original Message----- > From: christian.ehrhardt@canonical.com > Sent: Tuesday, July 12, 2022 3:45 PM > To: Pei, Andy > Cc: Maxime Coquelin ; dpdk stable > > Subject: patch 'vdpa/ifc/base: fix null pointer dereference' has been que= ued to > stable release 19.11.13 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 19.11.13 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 07/14/22. So please shout= if > anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he patch > applied to the branch. This will indicate if there was any rebasing neede= d 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 co= rrectly > done. >=20 > Queued patches are on a temporary branch at: > https://github.com/cpaelzer/dpdk-stable-queue >=20 > This queued commit can be viewed at: > https://github.com/cpaelzer/dpdk-stable- > queue/commit/d8cf14f38336b9dadd39f5d68be25f7a6d310f95 >=20 > Thanks. >=20 > Christian Ehrhardt >=20 > --- > From d8cf14f38336b9dadd39f5d68be25f7a6d310f95 Mon Sep 17 00:00:00 2001 > From: Andy Pei > Date: Fri, 8 Jul 2022 13:57:41 +0800 > Subject: [PATCH] vdpa/ifc/base: fix null pointer dereference >=20 > [ upstream commit 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf ] >=20 > Fix null pointer dereference reported in coverity scan. > Output some log information when lm_cfg is null. > Make sure lm_cfg is not null before operate on lm_cfg. >=20 > Coverity issue: 378882 > Fixes: d7fe5a2861e7 ("net/ifc: support live migration") >=20 > Signed-off-by: Andy Pei > Reviewed-by: Maxime Coquelin > --- > drivers/net/ifc/base/ifcvf.c | 17 +++++++++++++---- > drivers/net/ifc/base/ifcvf_osdep.h | 1 + > 2 files changed, 14 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c = index > d10c1fd6a4..f3c29f94b3 100644 > --- a/drivers/net/ifc/base/ifcvf.c > +++ b/drivers/net/ifc/base/ifcvf.c > @@ -87,6 +87,8 @@ next: > } >=20 > hw->lm_cfg =3D hw->mem_resource[4].addr; > + if (!hw->lm_cfg) > + WARNINGOUT("HW support live migration not support!\n"); >=20 > if (hw->common_cfg =3D=3D NULL || hw->notify_base =3D=3D NULL || > hw->isr =3D=3D NULL || hw->dev_cfg =3D=3D NULL) { @@ - > 218,10 +220,12 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) > &cfg->queue_used_hi); > IFCVF_WRITE_REG16(hw->vring[i].size, &cfg->queue_size); >=20 > - *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > - (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) =3D > - (u32)hw->vring[i].last_avail_idx | > - ((u32)hw->vring[i].last_used_idx << 16); > + if (lm_cfg) { > + *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > + (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * > 4) =3D > + (u32)hw->vring[i].last_avail_idx | > + ((u32)hw->vring[i].last_used_idx << 16); > + } >=20 > IFCVF_WRITE_REG16(i + 1, &cfg->queue_msix_vector); > if (IFCVF_READ_REG16(&cfg->queue_msix_vector) =3D=3D @@ - > 291,6 +295,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 log_base, u= 64 > log_size) > u8 *lm_cfg; >=20 > lm_cfg =3D hw->lm_cfg; > + if (!lm_cfg) > + return; >=20 > *(u32 *)(lm_cfg + IFCVF_LM_BASE_ADDR_LOW) =3D > log_base & IFCVF_32_BIT_MASK; > @@ -313,6 +319,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw) > u8 *lm_cfg; >=20 > lm_cfg =3D hw->lm_cfg; > + if (!lm_cfg) > + return; > + > *(u32 *)(lm_cfg + IFCVF_LM_LOGGING_CTRL) =3D IFCVF_LM_DISABLE; } >=20 > diff --git a/drivers/net/ifc/base/ifcvf_osdep.h > b/drivers/net/ifc/base/ifcvf_osdep.h > index 6aef25ea45..3d567695cc 100644 > --- a/drivers/net/ifc/base/ifcvf_osdep.h > +++ b/drivers/net/ifc/base/ifcvf_osdep.h > @@ -14,6 +14,7 @@ > #include > #include >=20 > +#define WARNINGOUT(S, args...) RTE_LOG(WARNING, PMD, S, ##args) > #define DEBUGOUT(S, args...) RTE_LOG(DEBUG, PMD, S, ##args) > #define STATIC static >=20 > -- > 2.37.0 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2022-07-12 09:44:11.761243494 +0200 > +++ 0002-vdpa-ifc-base-fix-null-pointer-dereference.patch 2022-07-12 > 09:44:11.676834710 +0200 > @@ -1 +1 @@ > -From 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf Mon Sep 17 00:00:00 > 2001 > +From d8cf14f38336b9dadd39f5d68be25f7a6d310f95 Mon Sep 17 00:00:00 > 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf ] > + > @@ -12 +13,0 @@ > -Cc: stable@dpdk.org > @@ -17,3 +18,3 @@ > - drivers/vdpa/ifc/base/ifcvf.c | 31 +++++++++++++++++++---------- > - drivers/vdpa/ifc/base/ifcvf_osdep.h | 1 + > - 2 files changed, 21 insertions(+), 11 deletions(-) > + drivers/net/ifc/base/ifcvf.c | 17 +++++++++++++---- > + drivers/net/ifc/base/ifcvf_osdep.h | 1 + > + 2 files changed, 14 insertions(+), 4 deletions(-) > @@ -21,4 +22,4 @@ > -diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf= .c -index > 0a9f71a960..f1e1474447 100644 > ---- a/drivers/vdpa/ifc/base/ifcvf.c > -+++ b/drivers/vdpa/ifc/base/ifcvf.c > +diff --git a/drivers/net/ifc/base/ifcvf.c > +b/drivers/net/ifc/base/ifcvf.c index d10c1fd6a4..f3c29f94b3 100644 > +--- a/drivers/net/ifc/base/ifcvf.c > ++++ b/drivers/net/ifc/base/ifcvf.c > @@ -34 +35 @@ > -@@ -218,17 +220,19 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) > +@@ -218,10 +220,12 @@ ifcvf_hw_enable(struct ifcvf_hw *hw) > @@ -38,11 +39,4 @@ > -- if (hw->device_type =3D=3D IFCVF_BLK) > -- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > -- i * IFCVF_LM_CFG_SIZE) =3D > -- (u32)hw->vring[i].last_avail_idx | > -- ((u32)hw->vring[i].last_used_idx << 16); > -- else > -- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > -- (i / 2) * IFCVF_LM_CFG_SIZE + > -- (i % 2) * 4) =3D > -- (u32)hw->vring[i].last_avail_idx | > -- ((u32)hw->vring[i].last_used_idx << 16); > +- *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > +- (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * 4) =3D > +- (u32)hw->vring[i].last_avail_idx | > +- ((u32)hw->vring[i].last_used_idx << 16); > @@ -50,11 +44,4 @@ > -+ if (hw->device_type =3D=3D IFCVF_BLK) > -+ *(u32 *)(lm_cfg + > IFCVF_LM_RING_STATE_OFFSET + > -+ i * IFCVF_LM_CFG_SIZE) =3D > -+ (u32)hw->vring[i].last_avail_idx | > -+ ((u32)hw->vring[i].last_used_idx << 16); > -+ else > -+ *(u32 *)(lm_cfg + > IFCVF_LM_RING_STATE_OFFSET + > -+ (i / 2) * IFCVF_LM_CFG_SIZE + > -+ (i % 2) * 4) =3D > -+ (u32)hw->vring[i].last_avail_idx | > -+ ((u32)hw->vring[i].last_used_idx << 16); > ++ *(u32 *)(lm_cfg + IFCVF_LM_RING_STATE_OFFSET + > ++ (i / 2) * IFCVF_LM_CFG_SIZE + (i % 2) * > 4) =3D > ++ (u32)hw->vring[i].last_avail_idx | > ++ ((u32)hw->vring[i].last_used_idx << 16); > @@ -65 +52 @@ > -@@ -320,6 +324,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 > log_base, u64 log_size) > +@@ -291,6 +295,8 @@ ifcvf_enable_logging(struct ifcvf_hw *hw, u64 > +log_base, u64 log_size) > @@ -74 +61 @@ > -@@ -342,6 +348,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw) > +@@ -313,6 +319,9 @@ ifcvf_disable_logging(struct ifcvf_hw *hw) > @@ -84 +71 @@ > -diff --git a/drivers/vdpa/ifc/base/ifcvf_osdep.h > b/drivers/vdpa/ifc/base/ifcvf_osdep.h > +diff --git a/drivers/net/ifc/base/ifcvf_osdep.h > +b/drivers/net/ifc/base/ifcvf_osdep.h > @@ -86,2 +73,2 @@ > ---- a/drivers/vdpa/ifc/base/ifcvf_osdep.h > -+++ b/drivers/vdpa/ifc/base/ifcvf_osdep.h > +--- a/drivers/net/ifc/base/ifcvf_osdep.h > ++++ b/drivers/net/ifc/base/ifcvf_osdep.h