Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 16 Nov 2022 07:39:00 -0800
From:   Ashok Raj <ashok.raj@intel.com>
To:     Thomas Gleixner <tglx@linutronix.de>
CC:     LKML <linux-kernel@vger.kernel.org>, <x86@kernel.org>,
        Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
        <linux-pci@vger.kernel.org>, Bjorn Helgaas <bhelgaas@google.com>,
        "Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
        Marc Zyngier <maz@kernel.org>,
        "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
        Jason Gunthorpe <jgg@mellanox.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Alex Williamson <alex.williamson@redhat.com>,
        Kevin Tian <kevin.tian@intel.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        Jon Mason <jdmason@kudzu.us>, Allen Hubbe <allenbh@gmail.com>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        <linuxppc-dev@lists.ozlabs.org>,
        "Ahmed S. Darwish" <darwi@linutronix.de>,
        Reinette Chatre <reinette.chatre@intel.com>,
        Ashok Raj <ashok.raj@intel.com>
Subject: Re: [patch 01/39] PCI/MSI: Check for MSI enabled in
 __pci_msix_enable()
Message-ID: <Y3UEFBJW1toFJZGn@a4bf019067fa.jf.intel.com>
References: <20221111120501.026511281@linutronix.de>
 <20221111122013.653556720@linutronix.de>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221111122013.653556720@linutronix.de>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R80onSgKEsRqoxl6kIQ8wA2H8hkVQ0+5v1JqH3pAmfKLe0+WqsxNuohkFmAI?=
 =?us-ascii?Q?9qT6eWYU7D+65YDBoh0oxj738I3PLbHgk3KfF2roINDh1ob1IXehVG8789jS?=
 =?us-ascii?Q?rrTuhBskfwmAn0slS6wxsWAucHpU5HPEeQMEf/VWrpa2G3pi150RLomumauA?=
 =?us-ascii?Q?+wF5VEG+wWfK/wYOcgCWH+X5/dnZ8xgEe/X87IlveXwdVL0NuAxMEY1MQPV7?=
 =?us-ascii?Q?rWhwr+b0KrpHf/ofxfx3c2FRQtvM5VxYYAgNppcTyjhnCvtm4pt9qraNV5Qf?=
 =?us-ascii?Q?445Jvt9odsQ2FJUHw2UXZmFWTElIUtrxgYmh900Z3qZCrZXr9t9wEszFiyj4?=
 =?us-ascii?Q?V+/LV1Aqb4+mT09GpIM7RBeSvC9A4TgxhHWoU+mvDHwyGeZQ6WcilKHADmUg?=
 =?us-ascii?Q?ghmVhpSGBZ1Q18XRcgMC7g5eds+x23lrgkDwzdLFhMQXPFQ1jqtZtCMORcdJ?=
 =?us-ascii?Q?SPHu1bFITMoHPQCVSLxM7k8hqmdYH4dWLhUet1Zvx1MvY5WDKoiTLFbr3BcW?=
 =?us-ascii?Q?hDyWuKHq0UfWl68ywicyO3nnvpB69O79yY50GHo/wXLMY2antKjuirTyLtYw?=
 =?us-ascii?Q?nDpP/VucVHD/9vEL384wdf245q/aH+kzMnlk7LBGg3OL1GVgGfRpCUdD3hkf?=
 =?us-ascii?Q?DBV9Rg/cdP51cUiHr975qm5Ba3PCDd05rzou0R6Lj/57LCjvkYAXYLxlwc6C?=
 =?us-ascii?Q?3C/xiG9frhRBY+3Qjqw7nKKDlF4kCAXAcFd2XTMgYIEB0f/RS/EIbxB5AcV5?=
 =?us-ascii?Q?tHVI5BcyNB1tn+Gmaua0/ehC8BfXTHZZyzixIyBfITwOILrAqM4gh7znNjN2?=
 =?us-ascii?Q?PcFIEDQvHj64oFL0AdrQsBj9O++Fbm7JfpgPowQBVaPYTxzeBtwxvg8pOHGS?=
 =?us-ascii?Q?Ao5uLYU0dSWl7yva0WA/45BdGSmQ+EL2fepT0Kd7qtzVPoFAEzIe2Fu2ljPK?=
 =?us-ascii?Q?EZ8Mz12WAyaxOD0g/2pljl3lxqg1+Uq478G+D6E8BnqREz6LijWOqGOn6Vcr?=
 =?us-ascii?Q?uSGWpJlXLKXVJZb11XrEggG7estOeKbyk8KD0WYLPiWIzKWZEs1Te5lIFsFd?=
 =?us-ascii?Q?3NCicVyH/wOkyufMoQD4jKGAIHFeaWXY/ky221DLp1ZzK1MnNs+Y8Js9RDmN?=
 =?us-ascii?Q?YQ9TL2CNSVkBjuhIqV8nGGoqF+uxb4wQCPsDiPozzaDjwW7VHyQsx7C4rbMR?=
 =?us-ascii?Q?3srxzUXuq1Z4K8YKBrbnlyhNCOvl1XyNSxiVrn7Sbku7ElT4P82Hz51otasM?=
 =?us-ascii?Q?ZXDJKvLqu6NOibu7hpR4crhMa9yfzq8wAMoodv7iXQcJD76YlVpQ+u+EWaqh?=
 =?us-ascii?Q?D9L1+g4Lbz1iVMgnvJbY12v/FhRzcdIE4FgtvcsCBHpzVFsizYIpqTLSF9x5?=
 =?us-ascii?Q?5N40uSjUw8VHXX/YzA4XC7OTy2t7APt7+ZNwbAp/M5wHrCxMGyqFX4sFxNIV?=
 =?us-ascii?Q?kiyF8MW3wpMMVFgkWduHVPgqkGlUTwTNPACR5ibDsvWfudNSTT5xoafDMO6R?=
 =?us-ascii?Q?ssLXFxWxnrZokQrTAPkH4Q0S4qbldNgMEadheHxe9soAuAod9Rbzsz7Qaqbn?=
 =?us-ascii?Q?kwwmW1ZBVjo1E3mFNZGjHVfkItg4OHREuJcYUQPC?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ab4bb54-1e5e-45c0-37c1-08dac7e8b1e9
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6201.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 15:39:05.9256
 (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: vwUBT2mKUBeFRXcaTxNodXPEMkDWCXzVn2UKSEboxUQetMK9Cywy2yKpel4tIIALtQp2LXcEvMpIa0AvVQS9dQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5810
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Nov 11, 2022 at 02:54:15PM +0100, Thomas Gleixner wrote:
> PCI/MSI and PCI/MSI-X are mutually exclusive, but the MSI-X enable code
> lacks a check for already enabled MSI.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  drivers/pci/msi/msi.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> --- a/drivers/pci/msi/msi.c
> +++ b/drivers/pci/msi/msi.c
> @@ -935,6 +935,11 @@ static int __pci_enable_msix_range(struc
>  	if (maxvec < minvec)
>  		return -ERANGE;
>  
> +	if (dev->msi_enabled) {
> +		pci_info(dev, "can't enable MSI-X (MSI already enabled)\n");
> +		return -EINVAL;
> +	}
> +

nit: 

Can the pre-enabled checks for msi and msix be moved up before any vector
range check?

not that it matters for how it fails, does EBUSY sound better?

looks good.

Reviewed-by: Ashok Raj <ashok.raj@intel.com>

>  	if (WARN_ON_ONCE(dev->msix_enabled))
>  		return -EINVAL;