From patchwork Sat Jul 21 18:04:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 947403 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Np3Uf38U"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Xwf95M5Jz9s4s for ; Sun, 22 Jul 2018 04:05:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728302AbeGUS7K (ORCPT ); Sat, 21 Jul 2018 14:59:10 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:36168 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728068AbeGUS7J (ORCPT ); Sat, 21 Jul 2018 14:59:09 -0400 Received: by mail-pl0-f67.google.com with SMTP id e11-v6so6507759plb.3 for ; Sat, 21 Jul 2018 11:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WfNlH7MD4766tSpdqr+7VWReovyiYb37tOAWwj5vtoA=; b=Np3Uf38U0D6BV9d2mt+2ysjM/qQtzT5k+NnhyNfcvI9dY6te1VnK0zlQr1hxWh26DQ wfkUcTi4vt8uc7HDOhdMrTa0S/6KGIG8eMI4HlMwaEEXTejkCSjQg3y6t0z80VVTB0B5 C9waYDopDYIjwpdQVKnn4AlYhJajZyH60INO6fsQxvdEW8ErJVj8UPNeSEy0cOLuNsc+ r8fRCQgFTYkBHqRZTjq8Cqx8RVbEkQW9wpklBRbvDh0OtZXZd8BLP7ZLXOgFCWWEJRP6 Y8gsDgGJuuwbUKNAMVdOjZ9C4WyYaMcYat6sR3LqQm4wiQCUxM59NaqZe7zsdy9xIZc0 2rlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WfNlH7MD4766tSpdqr+7VWReovyiYb37tOAWwj5vtoA=; b=rdswjTUzNRejsyZXP2XwpvUVrdhqepc71nYc+TjFF8UrGy1q/M9xrVhQhM92puKCjs zP2NVPoctpeeQVNti1AkAQOofgj99PYWhWFZeJAeWiEGWE1u+a61jZzT2ktbczqxQfcu /ZsVfN8DU1PBWaC3WjROEz5Nl4jSq9na9DmA+Q6ThjmYKAYd5GFO7tk26FxfLZeKgk4r SnvkSAyjh4DzJlR06ugKXdVhX9Crnw1tGs6ubCzRtxIoR/wSGiifJpLEZ3PWgVNuurD8 gcthVZFfnC5PT5aaP6aBAtPdpOaEs5IEx4K46CZvKbYmTVLkTpKGO6GjAwwiUOgZQue1 /GSg== X-Gm-Message-State: AOUpUlHqxZuk4FePjJJVsp8GFCRWFMWtQi8vn5KqPV2FdIfLCHQtuaue aVSU8grKDiMTofkhEo4Ys/o= X-Google-Smtp-Source: AAOMgpfLCc2wqXVc43QnswU3NtULcMwj1/HrfX+Cwmf5/l5bNA/gMDkvCoxCwtggEOkSiIQXA52QPg== X-Received: by 2002:a17:902:7781:: with SMTP id o1-v6mr6601295pll.48.1532196335011; Sat, 21 Jul 2018 11:05:35 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([36.102.208.98]) by smtp.gmail.com with ESMTPSA id l71-v6sm7063679pgd.70.2018.07.21.11.05.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 11:05:34 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: jasowang@redhat.com Cc: mst@redhat.com, makita.toshiaki@lab.ntt.co.jp, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH net-next v6 2/4] net: vhost: replace magic number of lock annotation Date: Sat, 21 Jul 2018 11:04:00 -0700 Message-Id: <1532196242-2998-3-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1532196242-2998-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1532196242-2998-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang Use the VHOST_NET_VQ_XXX as a subclass for mutex_lock_nested. Signed-off-by: Tonghao Zhang Acked-by: Jason Wang --- drivers/vhost/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index b224036..321264c 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -490,7 +490,7 @@ static void handle_tx(struct vhost_net *net) bool zcopy, zcopy_used; int sent_pkts = 0; - mutex_lock(&vq->mutex); + mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_TX); sock = vq->private_data; if (!sock) goto out; @@ -667,7 +667,7 @@ static int vhost_net_rx_peek_head_len(struct vhost_net *net, struct sock *sk, /* Flush batched heads first */ vhost_rx_signal_used(rnvq); /* Both tx vq and rx socket were polled here */ - mutex_lock_nested(&tvq->mutex, 1); + mutex_lock_nested(&tvq->mutex, VHOST_NET_VQ_TX); vhost_disable_notify(&net->dev, tvq); preempt_disable(); @@ -809,7 +809,7 @@ static void handle_rx(struct vhost_net *net) __virtio16 num_buffers; int recv_pkts = 0; - mutex_lock_nested(&vq->mutex, 0); + mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_RX); sock = vq->private_data; if (!sock) goto out;