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 AE371A0032 for ; Wed, 13 Jul 2022 04:13:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E10D410F6; Wed, 13 Jul 2022 04:13:06 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 608BF410F6 for ; Wed, 13 Jul 2022 04:13:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657678384; x=1689214384; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=po3tIFQrR2FMJDzA7f2gX/e97mQ4PIFgU8o3dKCIWAE=; b=TJhF/50Kkmknd1+Hjj4fVT4DwoMdq67cU0Byw1xtmUD8IW+OLDV8OsBN 4DH1Q6mhLgFomTO6qBbQE79+H7c/YBITXQotoDgwYE5raE1JzF3ckP8l4 i3C6+3G4nuwCMc6xRlEYZDfmjN3ubAR4m88SXmguvLDAQhyCI9DMAmtNZ NRMQCXd34b5AeoFgVKdzR1z1QvynrssaY9oF7y17JcJYpEW870uF34cfA znZIB25bieFYUhkQOp6gw1SnxEAurP07UchK6l/F6VVJuiNj3HG/C0pPz Tv/mag5PIesHMeKjo/1lunwxyeFJOHo1JuXgh2C7KLkz6KcRSHsTEODBm g==; X-IronPort-AV: E=McAfee;i="6400,9594,10406"; a="285113555" X-IronPort-AV: E=Sophos;i="5.92,266,1650956400"; d="scan'208";a="285113555" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 19:13:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,266,1650956400"; d="scan'208";a="922443302" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by fmsmga005.fm.intel.com with ESMTP; 12 Jul 2022 19:13:03 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX604.amr.corp.intel.com (10.22.229.17) 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 19:13:02 -0700 Received: from orsmsx606.amr.corp.intel.com (10.22.229.19) by ORSMSX611.amr.corp.intel.com (10.22.229.24) 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 19:13:02 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx606.amr.corp.intel.com (10.22.229.19) 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 19:13:02 -0700 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.173) by edgegateway.intel.com (134.134.137.100) 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 19:13:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JL0qYAdhNpdX7rjz6WsnUUGEWEwpT2kdILyHI826Bn2AKgfgCharkLXjaJTUTJbZOUJhQOCBNY/Cl0uu4O1ThPnpL5Mn6oXYxIh7yaDaqIXryluuFNZwLR/Y3OxBzKK36jYqV6wUTWicasCFoLRsFJUvmqlteTcdISf7mR3DaFi/kUi9lUGaafzyVWBmQ4KMoy20cApcpl8BKOSHqIqa6xj08ZMKFbrVUraU+9ryqDJsds8jfT/uz/fVu9TXCoGO0JniOZLXHfmSr7NeT5tZd61FMBSASUKvS5YGNpQrqjdmQJWIP/ZSIpiObp/bjuUC1CYU/6q3+qKuqXh2ypqaFw== 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=uJxuo1/+ut35P+fvDZbghHAh2NqzWnRt4rPmVofNxOg=; b=DaVm4XFFl+6wRzojlF8NXYexDQ1CDSNT0RLKJhWP5d9R1yUGIGOxO2iz+jXm1Oo7xV3T7ljoHRgswCvIsT8UnD33iUSPh8UKBDjlo3Yq0m8DfuEsXGqMja5XM2cZG2K31YIFLccMEIyIXEF+cRHYaYUgpYi6cakqi1paIdBzq9p/lf7gzjeDZpJ1OYKVsX1+/8tspO73h2g/rSJV6hJ696lcrSlF1JDok3k4Vx5GRjJD91ykgtjEFWePyG/Qy1jlXQ0B91Azn5/eJCuWLnfy2ImvqgM7g56u6sDsXDaYms5KDfQ8NRbDdiQ5Z5D4o3wHMPeF7gdCNg/y+WFhIUBlGw== 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 MN2PR11MB4256.namprd11.prod.outlook.com (2603:10b6:208:17b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Wed, 13 Jul 2022 02:13:01 +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; Wed, 13 Jul 2022 02:13:00 +0000 From: "Pei, Andy" To: "luca.boccassi@gmail.com" CC: Maxime Coquelin , dpdk stable Subject: RE: patch 'vdpa/ifc/base: fix null pointer dereference' has been queued to stable release 21.11.2 Thread-Topic: patch 'vdpa/ifc/base: fix null pointer dereference' has been queued to stable release 21.11.2 Thread-Index: AQHYliTy2TcaNS1XfECWcdDaqMro+617j8Eg Date: Wed, 13 Jul 2022 02:13:00 +0000 Message-ID: References: <20220706203506.3422496-31-luca.boccassi@gmail.com> <20220712192349.4174428-1-luca.boccassi@gmail.com> <20220712192349.4174428-3-luca.boccassi@gmail.com> In-Reply-To: <20220712192349.4174428-3-luca.boccassi@gmail.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: b7338072-2743-4259-6f61-08da6475362a x-ms-traffictypediagnostic: MN2PR11MB4256:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lEEsEkByqHQ0tMR2jxUGLhWfRRyfj8p44YBsc7fRju+a90N1ZyrUrZVZ5bsdK2uEwOOSxkN8gZzktCZPPPkon2icP6J2FtMWcJZHbB2XiFEjYblP6hsOg4XUr1aavKt/LJSC5zZtSK7IS4MJzTXNqLCiQ3xkjRQNVB6cArB7SdI8Yp/TI1jz928RqBV/eoYcXx/w9bPrrzn0dDTIl/kJhtrm7dFauWckqEkBqJLTRkejdouQP5SasUTlD8fm3+cstwF8xcd+vwWnPaAnUODT+yt8KLEfj5eK7c/a2dJuQaVpLfOb/jmyrUq5AU6RO61/8cfUNKBF5RllXZ2YXC2Q06p1lSipTKjPI4PUxOsSUGEebY2ppSyWarqcGOtDe2/GDT4kQgl/e5Pe97oy1nqwajf4pbxuf0RhpayK90Xdl0i/uKYPpuRuh3c0AAXSQpV8JMkISl/qF8lrrWeDfxKFA1qlPQ4vbpUTuFJXrApCVTAYx5AV+fGqppWLhiTmjAg+kuHSQFdPPqTL+teFI8knP7n4vvsrUKBNkhoxR2uQKHLisIpKRLFaCTez5kRvE2KhERWr20GZW75y5thg3a/vxrO9iWFIrKp4DUVgXNI6ayiXic+iL48Hx08PNDvwLI0uULTPs35vAk1/olsWWl7Tkt/g7mzoUsHC5EvN2opqrTjFAjPbVwzRF4fi1+R4eMEKrpQCwD/vSKZ81CgUntqA5ZN5LSa75A6oNmZDluaUdkhM6e1q/sSuOkekzSgOofXOXPG9uBT9zzAqM+zqYmAJVcAiVPtbKKHQt7mFEKwR0vJ+GbK/tO5rfmjlFHPRvktNRqQhOoVa6sAGXIvalCfDU+yfd2Jw72fq92945smTqzCt+6PkHekzHnA6LVrMRuMH 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)(346002)(366004)(39860400002)(136003)(376002)(396003)(66476007)(8676002)(4326008)(8936002)(76116006)(64756008)(6506007)(66946007)(66556008)(66446008)(82960400001)(122000001)(26005)(186003)(38100700002)(41300700001)(83380400001)(9686003)(53546011)(7696005)(316002)(71200400001)(478600001)(966005)(2906002)(38070700005)(33656002)(5660300002)(6916009)(54906003)(86362001)(52536014)(55016003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?UA8Dgny3LAOP2jZlwJefffepnA2xDEHx+dSk86DQS04n92QH6s9xr4NP0ZKD?= =?us-ascii?Q?iNNO+VqDlNFUuq5UnMm7tj00iqGRtGRcAOcamISJB5gmVFX6sdQAz5ae8GQt?= =?us-ascii?Q?e1zy4QbVXAs1rzAlW+hfJsTMwQ25pJyJ/mkS5T8n0xwmJZGgqgRESKCgInnR?= =?us-ascii?Q?mSMYe9BuN61BM9gg30UIT1gX8+TjyJlIsSYvWMNowqaSsFj68YFfULNl/qWG?= =?us-ascii?Q?kB6d0UB6+teV/Zl+c10NZTnoJAyOeU1w+HFX7JjzMt/o19zoHhgJMnZ/LKEy?= =?us-ascii?Q?etvNfDyR3hvxhDmelT5xRJchymyFqvWrSf3JZn1l26lHU8LfaVfT/lULmTxT?= =?us-ascii?Q?Iq7bPYp2WPG31lVcOvYNkpnr4prfBvGSG8TJC58vo/8/U5WxZKZdI7a2MDVm?= =?us-ascii?Q?xlgksnkfiUaJKJUgBqyZsUbwBJxBPWKwRL/Rd8R6J5+z9HugZr6RJangAfSE?= =?us-ascii?Q?pHwuAPQ4vz8nNd4Op5w0+rMmsfFyt+WUk8tJduBhrHwi6QynXxYayW03VSLw?= =?us-ascii?Q?+4FRDqq34CIdzSyvKjG3mNS3kc+mOTymMBHKBbtgh0rhiibFjxJ9jcqOl3ii?= =?us-ascii?Q?QvfJcho/n/hTb+dVpSXpODddSwYLZOicFDu9WeUhARU7t20y9TbnC8W9itA2?= =?us-ascii?Q?Bgg45hW5Ull8C5QSkk3IVo954Oo9DIGekf1neCAcGMqRjD8aX0GdG7qgBG/3?= =?us-ascii?Q?hOhNPPqM2+1yx6Anpe57ZhV+5P10Rh9IROLGdSzZGF1H3ew2QdwL9XAzRjPU?= =?us-ascii?Q?aQfatAG8jQ239DBhwBbWefAeWH+JdJ/Vz4xO5qq92ZQmKEi81Db2rkr/Ti9M?= =?us-ascii?Q?pFRbLxg8Isxxo1AocSAO1plqfHEhhIADfxjjp2USAXdOTEB65CjTQ18mAyQW?= =?us-ascii?Q?zqIyVBXcB1hp2T9KtJNoXsYbIHzvHHfjjG8hNCn6o7WwJmnIbiK0OGyJPv3R?= =?us-ascii?Q?ZY2l+RYauacCXsFC4BAn0vKQtFCsirQgqk4ZPRZvDNdGq2o11HuEqZYneEEQ?= =?us-ascii?Q?MJfZ54nnj4WNdUn3FS+ni/ge0MAbkOVLBlFfMF/ImUXJj7P31PTzyqerHH0I?= =?us-ascii?Q?uc4JYj2hRGfBA1Sp9SvmvaZblAQTRiECBvTs7N26PBoOYHN+sFRRpdSdKQ2L?= =?us-ascii?Q?rWjlKnuNW+YzlfUOAqIBVShxV7aexXwGfBk48NPFw+2f78E7W2jl/q7JEvbP?= =?us-ascii?Q?/KQx5T+KbkdVmXf8wleniSxzXZjBX/msHkehPfTDPUpAMqc8cABXJqKmeGf1?= =?us-ascii?Q?7r1cFLS3KqTJf1k3Bp+J0YVbhQdONPHZnlTiFMZMSkQOcGev0EpTcGZmdRob?= =?us-ascii?Q?wayYbcYk4hHr9yocsY/Q5Fp4+2xQ8DvuTxTm/ERVwH+TfCu2IigpraT5+KEG?= =?us-ascii?Q?7Pq9dvZBVXO5aDYiohhnPQU5Ro6tx5UKcBdq/YYqnisviA67xjNksW7Jakah?= =?us-ascii?Q?RWAcKq/bZf2D4TRNmckR+tHbTkRJGi9+sRRvG6EvaT1DVrMICwLo1xByASNz?= =?us-ascii?Q?QIWf0f+XSdb7+4ym/O6YJm9w/PKN1HU3CQUT6H2G/O33widEd9WlfhaEwe5D?= =?us-ascii?Q?6G7L+IWwtZyrYp+Wn+yzOblLT5+oeXM/+VU6Qpjh?= 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: b7338072-2743-4259-6f61-08da6475362a X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jul 2022 02:13:00.8423 (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: mHORGxulE6US4Ytt1ofcEJyJOdrdbrL9J4ZK+2JZ2m8KptnTUKcQuHphSUqcmGqKbIKaqAVuiyh7eYSx7p7Unw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4256 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 Thanks Luca. > -----Original Message----- > From: luca.boccassi@gmail.com > Sent: Wednesday, July 13, 2022 3:24 AM > To: Pei, Andy > Cc: Maxime Coquelin ; dpdk stable > > Subject: patch 'vdpa/ifc/base: fix null pointer dereference' has been que= ued to > stable release 21.11.2 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 21.11.2 >=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/kevintraynor/dpdk-stable >=20 > This queued commit can be viewed at: > https://github.com/kevintraynor/dpdk- > stable/commit/06b246ead61adaf7e92282f0b386d42469095894 >=20 > Thanks. >=20 > Luca Boccassi >=20 > --- > From 06b246ead61adaf7e92282f0b386d42469095894 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/vdpa/ifc/base/ifcvf.c | 17 +++++++++++++---- > drivers/vdpa/ifc/base/ifcvf_osdep.h | 1 + > 2 files changed, 14 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.= c index > d10c1fd6a4..f3c29f94b3 100644 > --- a/drivers/vdpa/ifc/base/ifcvf.c > +++ b/drivers/vdpa/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/vdpa/ifc/base/ifcvf_osdep.h > b/drivers/vdpa/ifc/base/ifcvf_osdep.h > index 6aef25ea45..3d567695cc 100644 > --- a/drivers/vdpa/ifc/base/ifcvf_osdep.h > +++ b/drivers/vdpa/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.34.1 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2022-07-12 20:22:33.817657799 +0100 > +++ 0003-vdpa-ifc-base-fix-null-pointer-dereference.patch 2022-07-12 > 20:22:33.709247162 +0100 > @@ -1 +1 @@ > -From 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf Mon Sep 17 00:00:00 > 2001 > +From 06b246ead61adaf7e92282f0b386d42469095894 Mon Sep 17 00:00:00 > 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit 60600018d3c6ae9ab4c24f9acb5c213bf9a21aaf ] > + > @@ -12 +13,0 @@ > -Cc: stable@dpdk.org > @@ -17 +18 @@ > - drivers/vdpa/ifc/base/ifcvf.c | 31 +++++++++++++++++++---------- > + drivers/vdpa/ifc/base/ifcvf.c | 17 +++++++++++++---- > @@ -19 +20 @@ > - 2 files changed, 21 insertions(+), 11 deletions(-) > + 2 files changed, 14 insertions(+), 4 deletions(-) > @@ -22 +23 @@ > -index 0a9f71a960..f1e1474447 100644 > +index d10c1fd6a4..f3c29f94b3 100644 > @@ -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)