Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A22F7C433E0 for ; Tue, 5 Jan 2021 12:40:06 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B298229C5 for ; Tue, 5 Jan 2021 12:40:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B298229C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.61886.109128 (Exim 4.92) (envelope-from ) id 1kwlcz-0004Vi-Ng; Tue, 05 Jan 2021 12:39:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61886.109128; Tue, 05 Jan 2021 12:39:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlcz-0004Vb-KP; Tue, 05 Jan 2021 12:39:57 +0000 Received: by outflank-mailman (input) for mailman id 61886; Tue, 05 Jan 2021 12:39:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwlcy-0004VV-QM for xen-devel@lists.xenproject.org; Tue, 05 Jan 2021 12:39:56 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 92c006c2-b92c-48ff-b7d5-c7abad12542c; Tue, 05 Jan 2021 12:39:55 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 153EEAA35; Tue, 5 Jan 2021 12:39:55 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 92c006c2-b92c-48ff-b7d5-c7abad12542c X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1609850395; h=from:from:reply-to: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=toAF4aeG+6sjzqGkBWMokesHdNyBSzsbmmZTb/XmjUE=; b=P3pVPzeBIGDvquFZ9Gry9a9War5glgzRiK12mrT1/RzD4t66QCbsAg40RJYaBqmDUp6BFS jx+hvQj634ySsrPCsCb8YfgOsiDvWMBminrHmO2UgXhc7xlKkZHg1t341F1GThXP/YdG9Q 8Kz6dbCRZrg5mc9s8DRZ/LSe8ddDWyU= From: Jan Beulich Subject: [PATCH v2] vPCI/MSI-X: fold clearing of entry->updated To: "xen-devel@lists.xenproject.org" Cc: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: Message-ID: Date: Tue, 5 Jan 2021 13:39:54 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Both call sites clear the flag after a successfull call to update_entry(). This can be simplified by moving the clearing into the function, onto its success path. As a result of neither caller caring about update_entry()'s return value anymore, the function gets switched to return void. Signed-off-by: Jan Beulich --- v2: Make update_entry() return void. --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -37,8 +37,8 @@ static uint32_t control_read(const struc (msix->masked ? PCI_MSIX_FLAGS_MASKALL : 0); } -static int update_entry(struct vpci_msix_entry *entry, - const struct pci_dev *pdev, unsigned int nr) +static void update_entry(struct vpci_msix_entry *entry, + const struct pci_dev *pdev, unsigned int nr) { int rc = vpci_msix_arch_disable_entry(entry, pdev); @@ -48,7 +48,7 @@ static int update_entry(struct vpci_msix gprintk(XENLOG_WARNING, "%pp: unable to disable entry %u for update: %d\n", &pdev->sbdf, nr, rc); - return rc; + return; } rc = vpci_msix_arch_enable_entry(entry, pdev, @@ -59,10 +59,10 @@ static int update_entry(struct vpci_msix gprintk(XENLOG_WARNING, "%pp: unable to enable entry %u: %d\n", &pdev->sbdf, nr, rc); /* Entry is likely not properly configured. */ - return rc; + return; } - return 0; + entry->updated = false; } static void control_write(const struct pci_dev *pdev, unsigned int reg, @@ -90,13 +90,8 @@ static void control_write(const struct p if ( new_enabled && !new_masked && (!msix->enabled || msix->masked) ) { for ( i = 0; i < msix->max_entries; i++ ) - { - if ( msix->entries[i].masked || !msix->entries[i].updated || - update_entry(&msix->entries[i], pdev, i) ) - continue; - - msix->entries[i].updated = false; - } + if ( !msix->entries[i].masked && msix->entries[i].updated ) + update_entry(&msix->entries[i], pdev, i); } else if ( !new_enabled && msix->enabled ) { @@ -363,10 +358,7 @@ static int msix_write(struct vcpu *v, un * data fields Xen needs to disable and enable the entry in order * to pick up the changes. */ - if ( update_entry(entry, pdev, vmsix_entry_nr(msix, entry)) ) - break; - - entry->updated = false; + update_entry(entry, pdev, vmsix_entry_nr(msix, entry)); } else vpci_msix_arch_mask_entry(entry, pdev, entry->masked);