From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/, app-emulation/virtualbox/
Date: Fri, 9 Dec 2016 22:28:54 +0000 (UTC) [thread overview]
Message-ID: <1481322521.2b91777aca23544ebd8de16f9e4f3bc68600bc72.polynomial-c@gentoo> (raw)
commit: 2b91777aca23544ebd8de16f9e4f3bc68600bc72
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 22:28:41 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 9 22:28:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b91777a
app-emulation/virtualbox: Upstream patch to fix some SAS timeouts.
Package-Manager: portage-2.3.3
.../files/virtualbox-5.1.10-sas_timeouts.patch | 94 ++++++++++++++++++++++
...x-5.1.10.ebuild => virtualbox-5.1.10-r1.ebuild} | 1 +
2 files changed, 95 insertions(+)
diff --git a/app-emulation/virtualbox/files/virtualbox-5.1.10-sas_timeouts.patch b/app-emulation/virtualbox/files/virtualbox-5.1.10-sas_timeouts.patch
new file mode 100644
index 00000000..eeeb474
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-5.1.10-sas_timeouts.patch
@@ -0,0 +1,94 @@
+Index: vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+===================================================================
+--- vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 64807)
++++ vbox/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (revision 64808)
+@@ -286,6 +286,12 @@
+ PDMCRITSECT ReplyPostQueueCritSect;
+ /** Critical section protecting the reply free queue. */
+ PDMCRITSECT ReplyFreeQueueCritSect;
++ /** Critical section protecting the request queue against
++ * concurrent access from the guest. */
++ PDMCRITSECT RequestQueueCritSect;
++ /** Critical section protecting the reply free queue against
++ * concurrent write access from the guest. */
++ PDMCRITSECT ReplyFreeQueueWriteCritSect;
+
+ /** Pointer to the start of the reply free queue - R3. */
+ R3PTRTYPE(volatile uint32_t *) pReplyFreeQueueBaseR3;
+@@ -1275,14 +1281,22 @@
+ {
+ case LSILOGIC_REG_REPLY_QUEUE:
+ {
++ int rc = PDMCritSectEnter(&pThis->ReplyFreeQueueWriteCritSect, VINF_IOM_R3_MMIO_WRITE);
++ if (rc != VINF_SUCCESS)
++ return rc;
+ /* Add the entry to the reply free queue. */
+ ASMAtomicWriteU32(&pThis->CTX_SUFF(pReplyFreeQueueBase)[pThis->uReplyFreeQueueNextEntryFreeWrite], u32);
+ pThis->uReplyFreeQueueNextEntryFreeWrite++;
+ pThis->uReplyFreeQueueNextEntryFreeWrite %= pThis->cReplyQueueEntries;
++ PDMCritSectLeave(&pThis->ReplyFreeQueueWriteCritSect);
+ break;
+ }
+ case LSILOGIC_REG_REQUEST_QUEUE:
+ {
++ int rc = PDMCritSectEnter(&pThis->RequestQueueCritSect, VINF_IOM_R3_MMIO_WRITE);
++ if (rc != VINF_SUCCESS)
++ return rc;
++
+ uint32_t uNextWrite = ASMAtomicReadU32(&pThis->uRequestQueueNextEntryFreeWrite);
+
+ ASMAtomicWriteU32(&pThis->CTX_SUFF(pRequestQueueBase)[uNextWrite], u32);
+@@ -1296,6 +1310,7 @@
+ uNextWrite++;
+ uNextWrite %= pThis->cRequestQueueEntries;
+ ASMAtomicWriteU32(&pThis->uRequestQueueNextEntryFreeWrite, uNextWrite);
++ PDMCritSectLeave(&pThis->RequestQueueCritSect);
+
+ /* Send notification to R3 if there is not one sent already. Do this
+ * only if the worker thread is not sleeping or might go sleeping. */
+@@ -1309,7 +1324,7 @@
+ PDMQueueInsert(pThis->CTX_SUFF(pNotificationQueue), pNotificationItem);
+ #else
+ LogFlowFunc(("Signal event semaphore\n"));
+- int rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
++ rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+ AssertRC(rc);
+ #endif
+ }
+@@ -5304,6 +5319,8 @@
+
+ PDMR3CritSectDelete(&pThis->ReplyFreeQueueCritSect);
+ PDMR3CritSectDelete(&pThis->ReplyPostQueueCritSect);
++ PDMR3CritSectDelete(&pThis->RequestQueueCritSect);
++ PDMR3CritSectDelete(&pThis->ReplyFreeQueueWriteCritSect);
+
+ RTMemFree(pThis->paDeviceStates);
+ pThis->paDeviceStates = NULL;
+@@ -5470,6 +5487,14 @@
+ if (RT_FAILURE(rc))
+ return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for reply post queue"));
+
++ rc = PDMDevHlpCritSectInit(pDevIns, &pThis->RequestQueueCritSect, RT_SRC_POS, "%sRQ", szDevTag);
++ if (RT_FAILURE(rc))
++ return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for request queue"));
++
++ rc = PDMDevHlpCritSectInit(pDevIns, &pThis->ReplyFreeQueueWriteCritSect, RT_SRC_POS, "%sRFQW", szDevTag);
++ if (RT_FAILURE(rc))
++ return PDMDEV_SET_ERROR(pDevIns, rc, N_("LsiLogic: cannot create critical section for reply free queue write access"));
++
+ /*
+ * Register the PCI device, it's I/O regions.
+ */
+Index: vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
+===================================================================
+--- vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 64807)
++++ vbox/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (revision 64808)
+@@ -1744,6 +1744,8 @@
+ GEN_CHECK_OFF(LSILOGICSCSI, cRequestQueueEntries);
+ GEN_CHECK_OFF(LSILOGICSCSI, ReplyPostQueueCritSect);
+ GEN_CHECK_OFF(LSILOGICSCSI, ReplyFreeQueueCritSect);
++ GEN_CHECK_OFF(LSILOGICSCSI, RequestQueueCritSect);
++ GEN_CHECK_OFF(LSILOGICSCSI, ReplyFreeQueueWriteCritSect);
+ GEN_CHECK_OFF(LSILOGICSCSI, pReplyFreeQueueBaseR3);
+ GEN_CHECK_OFF(LSILOGICSCSI, pReplyPostQueueBaseR3);
+ GEN_CHECK_OFF(LSILOGICSCSI, pRequestQueueBaseR3);
diff --git a/app-emulation/virtualbox/virtualbox-5.1.10.ebuild b/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild
similarity index 99%
rename from app-emulation/virtualbox/virtualbox-5.1.10.ebuild
rename to app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild
index cd60f3e..40c2eb3 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.10.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild
@@ -183,6 +183,7 @@ src_prepare() {
fi
eapply "${WORKDIR}/patches"
+ eapply "${FILESDIR}/${P}-sas_timeouts.patch"
eapply_user
}
next reply other threads:[~2016-12-09 22:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 22:28 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-18 13:32 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/files/, app-emulation/virtualbox/ Viorel Munteanu
2023-09-30 4:36 Viorel Munteanu
2023-06-15 10:44 Viorel Munteanu
2023-05-30 5:22 Viorel Munteanu
2023-01-22 9:59 Viorel Munteanu
2023-01-11 15:38 Viorel Munteanu
2022-07-27 21:05 Sam James
2022-07-06 3:01 Sam James
2022-07-06 3:01 Sam James
2022-06-15 12:37 Lars Wendler
2022-06-15 12:37 Lars Wendler
2021-08-03 11:18 Lars Wendler
2019-02-02 10:41 Lars Wendler
2018-12-07 20:17 Lars Wendler
2018-04-11 7:54 Lars Wendler
2015-09-29 13:29 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1481322521.2b91777aca23544ebd8de16f9e4f3bc68600bc72.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox