From patchwork Tue May 26 12:59:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1297977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49WYwT1C67z9sTC; Tue, 26 May 2020 23:00:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jdZBs-0003kk-Mk; Tue, 26 May 2020 13:00:20 +0000 Received: from mail-pf1-f193.google.com ([209.85.210.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jdZBo-0003h7-O7 for kernel-team@lists.ubuntu.com; Tue, 26 May 2020 13:00:16 +0000 Received: by mail-pf1-f193.google.com with SMTP id n18so10154441pfa.2 for ; Tue, 26 May 2020 06:00:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PmRgWuE2UXULuEjp0gd9TwNOV+8ZA4gWskpYokQYSTY=; b=HboIRUoEyPQIkZT0okCX3Fc59Hrff4IGQTeCJrtuYBAkHnImq5HsszefhWOKSy/ekY BgLgeuGzT7ESV7MI3qyAwLKHTFpOc0sLp+uDF0RTgsfXLkNFVK11sFCyScYx8gkW20Sz jwnuOKbkEZ5cqrtRteAYbgAdxFoKv1HBehrPuPyZxJChijTyrW9/SwFmN6N4ClrKTdT5 n0e8Yz5ftRsa2t3OlrXjb5LVr3Px5lJwRgidK5Ewt2DpJR42kTjZbwGkfQs+zkjLYfkv ypEISjMwon7lTptML+qgyeJfXfxRHuupVXbpvN84sK49t6nthbMX43USGv8XRHuY3pHL kZDw== X-Gm-Message-State: AOAM532HP5+bzuavzEGaozxFb08HlZTvMgx/KiLITkF3O09Mp4mqvBDf R3u80RhJV1hJqgzrRDrKYk5iwkrPrvw= X-Google-Smtp-Source: ABdhPJwn+j07J8hSDGGio6qdhiMmMMO3QfYxUcYcsNxuWFkyfiwW7ewenMGhOUjzYAtLT6fRFjwTQg== X-Received: by 2002:a65:498f:: with SMTP id r15mr925672pgs.345.1590498014821; Tue, 26 May 2020 06:00:14 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id f11sm15495195pfa.32.2020.05.26.06.00.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:00:13 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 06/42][SRU][U] UBUNTU: SAUCE: iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU Date: Tue, 26 May 2020 20:59:18 +0800 Message-Id: <20200526125954.237403-7-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200526125954.237403-1-vicamo.yang@canonical.com> References: <20200526125954.237403-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Joerg Roedel BugLink: https://bugs.launchpad.net/bugs/1876707 When check_device() fails on the device, it is not handled by the IOMMU and amd_iommu_add_device() needs to return -ENODEV. Signed-off-by: Joerg Roedel Link: https://lore.kernel.org/r/20200429133712.31431-7-joro@8bytes.org Signed-off-by: Joerg Roedel (cherry picked from commit 57bd2c24ba1673bd47828f6ac5eaaa6292a03582 iommu/next) Signed-off-by: You-Sheng Yang --- drivers/iommu/amd_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index af9fc3156c64..8dbde24d196d 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2228,9 +2228,12 @@ static int amd_iommu_add_device(struct device *dev) struct amd_iommu *iommu; int ret, devid; - if (!check_device(dev) || get_dev_data(dev)) + if (get_dev_data(dev)) return 0; + if (!check_device(dev)) + return -ENODEV; + devid = get_device_id(dev); if (devid < 0) return devid;