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 6D850A00C2 for ; Mon, 26 Sep 2022 10:23:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65E1D400D7; Mon, 26 Sep 2022 10:23:43 +0200 (CEST) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mails.dpdk.org (Postfix) with ESMTP id 40319400D5 for ; Mon, 26 Sep 2022 10:23:42 +0200 (CEST) Received: by mail-lf1-f44.google.com with SMTP id a3so9606373lfk.9 for ; Mon, 26 Sep 2022 01:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=TZ6KZANGWhlvet5pg0LSqyeDjHFz852znq27/sSuNE4=; b=ECtK41YGyRaiB63aWvVP64SSG+t2fkzH8wCrrXFEGLMFW6jpZqoPI5bxFzlQl5Wrvp 0XFgQlpDmszIzkH5IUVDDsYcnCCNPOK09lxtnn/m9JN+ugXKisdF7sYwp3Wbk8ggubhQ 9xllV/UmmwbW37dIidlEAnS+b9XemIEHoTPXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=TZ6KZANGWhlvet5pg0LSqyeDjHFz852znq27/sSuNE4=; b=M5ar+HiNXE4Jd+D8vUqaLjrYflOL6SUL47Itr3Rejio86BbbbacwYQO1imhnUWT5rY poG4R8HqaQcsvlVK+NgvdzxnxfjkmKwDoGPnLtThsKyu/oweQdgRJX6nCYxzfkONnhJn 5vhh3YKgBodm38hTGkbKW0Aow5J/3wY/W6Ja3z32yqVRn1kHjdH0Jrk7ISnkg+4Elnsr 17S8xxrIvHmgmbJvR01Dtx9PRRWRTpIYYXRcMU0+Nuc4k4VTzEmUuJBBacGp6i0XxDnW TY5WFDA7G8/5GapQ3kjHIsvCpOaI0VqQRJTT5fNC052qWSWnRexau5LwKVu+DykyQ3Qa pTYA== X-Gm-Message-State: ACrzQf0DysZ4f06WtJNlZwtjOotAbbH2k5o/MZGZFsO1zzwmxGSjb+NI p1akYwVCnxP1zzaW0DhM9DxpQQ== X-Google-Smtp-Source: AMsMyM7CkRB1a2EgzMyHnsuOWBJ/shHHcZW2GO6AWpgA8/3RkB7qiHt/YlYVNHtK0c05WUrnOh8oPw== X-Received: by 2002:a05:6512:3053:b0:499:183:d5fb with SMTP id b19-20020a056512305300b004990183d5fbmr7894789lfb.98.1664180621712; Mon, 26 Sep 2022 01:23:41 -0700 (PDT) Received: from pb1-dev.ad.sperasoft.com ([188.233.188.88]) by smtp.gmail.com with ESMTPSA id m4-20020a2e8704000000b0026bfadf87e3sm2305283lji.20.2022.09.26.01.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 01:23:41 -0700 (PDT) From: Alexander Chernavin To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, Alexander Chernavin , stable@dpdk.org Subject: [PATCH v2] net/virtio: fix crash when dev is configured twice Date: Mon, 26 Sep 2022 08:23:39 +0000 Message-Id: <20220926082339.1178538-1-achernavin@netgate.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 When first attempt to configure a device with RX interrupt enabled fails for some reason (e.g. because "Multiple intr vector not supported"), second attempt to configure the device with RX interrupt disabled and feature set unchanged will succeed but will leave virtio queues not allocated. Accessing the queues will cause a segfault. First attempt: - virtio_dev_configure() - virtio_init_device() is called to reinit the device because "dev->data->dev_conf.intr_conf.rxq" is "1" - virtio_configure_intr() fails and returns an error - virtio_free_queues() frees previously allocated virtio queues - virtio_init_device() fails and returns an error - virtio_dev_configure() fails and returns an error Second attempt: - virtio_dev_configure() - This time virtio_init_device() is not called, virtio queues are not allocated With this fix, reinit the device during configuration if virtio queues are not allocated. Cc: stable@dpdk.org Signed-off-by: Alexander Chernavin --- v2: * Also CC to stable@dpdk.org drivers/net/virtio/virtio_ethdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d180162abd..38bfe050b5 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2616,6 +2616,13 @@ virtio_dev_configure(struct rte_eth_dev *dev) return ret; } + /* if queues are not allocated, reinit the device */ + if (hw->vqs == NULL) { + ret = virtio_init_device(dev, hw->req_guest_features); + if (ret < 0) + return ret; + } + if ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) && !virtio_with_feature(hw, VIRTIO_NET_F_RSS)) { PMD_DRV_LOG(ERR, "RSS support requested but not supported by the device"); -- 2.25.1